Merge remote-tracking branch 'origin/5.5.1' into 5.5

Change-Id: I2942591e1c1ca86ce0f6476e0a5c3033cdf861ee

1 files changed, 2 insertions, 10 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,