diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2019-10-25 19:20:06 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2019-10-27 20:00:02 +0200 |
| commit | 22c3fd050843d2a56fb927492501c3798d253257 (patch) | |
| tree | 064f9590bdda1b789d64a055425fea5a7b75fe52 /src/plugins/platforms/cocoa | |
| parent | 48603baf949f12928476f11e17fd387b8903d971 (diff) | |
macOS: Remove assert that primary display always matches CGMainDisplayID
Fixes: QTBUG-78707
Change-Id: Ia517f543728c76dcf19558e9e68ed97db7cfaaa4
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoascreen.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm index 392099d083..0e55838e05 100644 --- a/src/plugins/platforms/cocoa/qcocoascreen.mm +++ b/src/plugins/platforms/cocoa/qcocoascreen.mm @@ -552,10 +552,10 @@ QPixmap QCocoaScreen::grabWindow(WId view, int x, int y, int width, int height) */ 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 |