macOS: Remove assert that primary display always matches CGMainDisplayID

Fixes: QTBUG-78707 Change-Id: Ia517f543728c76dcf19558e9e68ed97db7cfaaa4 Reviewed-by: Timur Pocheptsov <[email protected]>
wx984490083 · Oct 27, 2019 · 22c3fd0 · 22c3fd0
1 parent 48603ba
commit 22c3fd0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm
@@ -552,10 +552,10 @@ void flushOutput() {
 */
 QCocoaScreen *QCocoaScreen::primaryScreen()
 {
-    auto screen = static_cast<QCocoaScreen *>(QGuiApplication::primaryScreen()->handle());
-    Q_ASSERT_X(screen == get(CGMainDisplayID()), "QCocoaScreen",
-        "The application's primary screen should always be in sync with the main display");
-    return screen;
+    // Note: The primary screen that Qt knows about may not match the current CGMainDisplayID()
+    // if macOS has not yet been able to inform us that the main display has changed, but we
+    // will update the primary screen accordingly once the reconfiguration callback comes in.
+    return static_cast<QCocoaScreen *>(QGuiApplication::primaryScreen()->handle());
 }
 
 QList<QPlatformScreen*> QCocoaScreen::virtualSiblings() const