Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly

Change-Id: Ie6757dd81b49f4d9e677dbd08f5378d6190187b7

1 files changed, 6 insertions, 11 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm
index 8499b3fd57..503836d071 100644
--- a/src/corelib/kernel/qeventdispatcher_cf.mm
+++ b/src/corelib/kernel/qeventdispatcher_cf.mm
@@ -72,17 +72,12 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(RunLoopModeTracker);
     if (self = [super init]) {
         m_runLoopModes.push(kCFRunLoopDefaultMode);
 
-        [[NSNotificationCenter defaultCenter]
-            addObserver:self
-            selector:@selector(receivedNotification:)
-            name:nil
-#ifdef Q_OS_OSX
-            object:[NSApplication sharedApplication]];
-#elif defined(Q_OS_WATCHOS)
-            object:[WKExtension sharedExtension]];
-#else
-            // Use performSelector so this can work in an App Extension
-            object:[[UIApplication class] performSelector:@selector(sharedApplication)]];
+#if !defined(Q_OS_WATCHOS)
+        if (!qt_apple_isApplicationExtension()) {
+            [[NSNotificationCenter defaultCenter]
+                addObserver:self selector:@selector(receivedNotification:)
+                name:nil object:qt_apple_sharedApplication()];
+        }
 #endif
     }