diff options
Diffstat (limited to 'src/plugins')
5 files changed, 9 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm index 62f2cc30e0..e6e46cda81 100644 --- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm +++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm @@ -92,10 +92,6 @@ #include <qpa/qwindowsysteminterface.h> #include <qwindowdefs.h> -QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQpaApplication, "qt.qpa.application"); -QT_END_NAMESPACE - QT_USE_NAMESPACE @implementation QCocoaApplicationDelegate { diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h index d78aaadd4e..883c409924 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.h +++ b/src/plugins/platforms/cocoa/qcocoahelpers.h @@ -72,6 +72,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcQpaWindow) Q_DECLARE_LOGGING_CATEGORY(lcQpaDrawing) Q_DECLARE_LOGGING_CATEGORY(lcQpaMouse) Q_DECLARE_LOGGING_CATEGORY(lcQpaScreen) +Q_DECLARE_LOGGING_CATEGORY(lcQpaApplication) class QPixmap; class QString; diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm index 3e37010497..389766fdc7 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -59,6 +59,7 @@ Q_LOGGING_CATEGORY(lcQpaWindow, "qt.qpa.window"); Q_LOGGING_CATEGORY(lcQpaDrawing, "qt.qpa.drawing"); Q_LOGGING_CATEGORY(lcQpaMouse, "qt.qpa.input.mouse", QtCriticalMsg); Q_LOGGING_CATEGORY(lcQpaScreen, "qt.qpa.screen", QtCriticalMsg); +Q_LOGGING_CATEGORY(lcQpaApplication, "qt.qpa.application"); // // Conversion Functions diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index f8b9e9fc12..1e330344af 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -132,6 +132,7 @@ public: void setApplicationIcon(const QIcon &icon) const override; void beep() const override; + void quit() const override; void closePopups(QWindow *forWindow = nullptr); diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 250d9fc6e5..872d9bb7f1 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -488,6 +488,12 @@ void QCocoaIntegration::beep() const NSBeep(); } +void QCocoaIntegration::quit() const +{ + qCDebug(lcQpaApplication) << "Terminating application"; + [NSApp terminate:nil]; +} + void QCocoaIntegration::closePopups(QWindow *forWindow) { for (auto it = m_popupWindowStack.begin(); it != m_popupWindowStack.end();) { |