Introduce Qt::AA_PluginApplication replacing Qt::AA_MacPluginApplication.

Reuse the enumeration value for a generic Qt::AA_PluginApplication
attribute since there are also initializations in platform ports other
than OS X that need to be suppressed in the plugin case.

Task-number: QTBUG-47556
Task-number: QTBUG-45762
Change-Id: I885f75030a251ccf66597aae3580499d012934e7
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 2e6bfc95db..c988bdc6a7 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -316,7 +316,7 @@ QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
     // ### For AA_MacPluginApplication we don't want to load the menu nib.
     // Qt 4 also does not set the application delegate, so that behavior
     // is matched here.
-    if (!QCoreApplication::testAttribute(Qt::AA_MacPluginApplication)) {
+    if (!QCoreApplication::testAttribute(Qt::AA_PluginApplication)) {
 
         // Set app delegate, link to the current delegate (if any)
         QCocoaApplicationDelegate *newDelegate = [QCocoaApplicationDelegate sharedDelegate];
@@ -343,7 +343,7 @@ QCocoaIntegration::~QCocoaIntegration()
     qt_resetNSApplicationSendEvent();
 
     QMacAutoReleasePool pool;
-    if (!QCoreApplication::testAttribute(Qt::AA_MacPluginApplication)) {
+    if (!QCoreApplication::testAttribute(Qt::AA_PluginApplication)) {
         // remove the apple event handlers installed by QCocoaApplicationDelegate
         QCocoaApplicationDelegate *delegate = [QCocoaApplicationDelegate sharedDelegate];
         [delegate removeAppleEventHandlers];