diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 12 | ||||
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtscreen.cpp | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 8f84539e04..c8f6dd05db 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -86,17 +86,9 @@ void QCocoaScreen::updateGeometry() NSRect frameRect = [nsScreen frame]; - // Since Mavericks, there is a setting, System Preferences->Mission Control-> - // Displays have separate Spaces. - BOOL spansDisplays = NO; -#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9) - if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_9) - spansDisplays = [NSScreen screensHaveSeparateSpaces]; -#endif - if (spansDisplays || m_screenIndex == 0) { + if (m_screenIndex == 0) { m_geometry = QRect(frameRect.origin.x, frameRect.origin.y, frameRect.size.width, frameRect.size.height); - // Displays have separate Spaces setting is on or this is the primary screen, - // the one that contains the menubar. Its origin should be + // This is the primary screen, the one that contains the menubar. Its origin should be // (0, 0), and it's the only one whose available geometry differs from its full geometry. NSRect visibleRect = [nsScreen visibleFrame]; m_availableGeometry = QRect(visibleRect.origin.x, diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp index 1d36bb31f6..8962332208 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.cpp +++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp @@ -1115,7 +1115,7 @@ HRESULT QWinRTScreen::onSuspended(IInspectable *, ISuspendingEventArgs *) #ifndef Q_OS_WINPHONE Q_D(QWinRTScreen); ComPtr<ID3D11Device> d3dDevice; - const EGLBoolean ok = eglQuerySurfacePointerANGLE(d->eglDisplay, EGL_NO_SURFACE, EGL_DEVICE_EXT, (void **)d3dDevice.GetAddressOf()); + const EGLBoolean ok = eglQuerySurfacePointerANGLE(d->eglDisplay, d->eglSurface, EGL_DEVICE_EXT, (void **)d3dDevice.GetAddressOf()); if (ok && d3dDevice) { ComPtr<IDXGIDevice3> dxgiDevice; if (SUCCEEDED(d3dDevice.As(&dxgiDevice))) |