Ticket #62964: patch-qcocoa-build-on-109.diff

src/plugins/platforms/cocoa/qcocoamenu.mm

@@ -331 +331 @@
 
     // Empty menus on a menubar are hidden by default. If the menu gets
     // added to the menubar before it contains any item, we need to sync.
-    if (isVisible() && attachedItem().hidden) {
+    if (isVisible() && [m_attachedItem isHidden]) {
         if (auto *mb = qobject_cast<QCocoaMenuBar *>(menuParent()))
             mb->syncMenu(this);
     }

src/plugins/platforms/cocoa/qcocoanativeinterface.mm

@@ -172 +172 @@
 
 QPixmap QCocoaNativeInterface::defaultBackgroundPixmapForQWizard()
 {
+    QCFType<CFURLRef> url109;
+    CFURLRef url = nullptr;
     const int ExpectedImageWidth = 242;
     const int ExpectedImageHeight = 414;
-    QCFType<CFArrayRef> urls = LSCopyApplicationURLsForBundleIdentifier(
-        CFSTR("com.apple.KeyboardSetupAssistant"), nullptr);
-    if (urls && CFArrayGetCount(urls) > 0) {
-        CFURLRef url = (CFURLRef)CFArrayGetValueAtIndex(urls, 0);
+    bool ok = false;
+    if (QSysInfo::macVersion() < QSysInfo::MV_10_10) {
+        if (LSFindApplicationForInfo(kLSUnknownCreator, CFSTR("com.apple.KeyboardSetupAssistant"),
+                                     0, 0, &url109) == noErr) {
+            url = url109;
+            ok = true;
+        }
+    } else {
+#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_10)
+        QCFType<CFArrayRef> urls = LSCopyApplicationURLsForBundleIdentifier(
+            CFSTR("com.apple.KeyboardSetupAssistant"), nullptr);
+        if (urls && CFArrayGetCount(urls) > 0) {
+            url = (CFURLRef)CFArrayGetValueAtIndex(urls, 0);
+            ok = true;
+        }
+#endif
+    }
+    if (ok) {
         QCFType<CFBundleRef> bundle = CFBundleCreate(kCFAllocatorDefault, url);
         if (bundle) {
             url = CFBundleCopyResourceURL(bundle, CFSTR("Background"), CFSTR("png"), 0);

src/plugins/platforms/cocoa/qcocoawindow.mm

@@ -60 +60 @@
 
 #include <vector>
 
+#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_10)
+#   define NSWINPROPERTY(w,property,selector) (w).property
+#else
+#   define NSWINPROPERTY(w,property,selector) [(w) selector]
+#endif
+
+#ifndef __has_builtin
+#   define __has_builtin(x) false
+#endif
+
 enum {
     defaultWindowWidth = 160,
     defaultWindowHeight = 160
@@ -320 +326 @@
 + (void)applicationActivationChanged:(NSNotification*)notification
 {
     const id sender = self;
+#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_11)
+    // ObjC generics were introduced with Xcode 7 (= OS X 10.10) but only allow the compiler
+    // to generate errors when storing a deviant type. The 10.10SDK on 10.9 doesn't yet
+    // know about them, so we only support them from 10.11 onwards.
     NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
+#else
+    NSEnumerator *windowEnumerator = nullptr;
+#endif
     NSApplication *application = [NSApplication sharedApplication];
 
 #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
@@ -779 +792 @@
     if ([m_nsWindow isVisible])
         return;
 
-    if (m_view.window.parentWindow && !m_view.window.parentWindow.visible) {
+    if (m_view.window.parentWindow && !NSWINPROPERTY(m_view.window.parentWindow,visible,isVisible)) {
         m_hiddenByAncestor = true; // Parent still hidden, don't show now
     } else if ((becauseOfAncestor == m_hiddenByAncestor) // Was NEITHER explicitly hidden
                && !m_hiddenByClipping) { // ... NOR clipped
@@ -2095 +2108 @@
     // FIXME: Support compound states (Qt::WindowStates)
 
     NSWindow *window = m_view.window;
-    if (window.miniaturized)
+    if (NSWINPROPERTY(window, miniaturized, isMiniaturized))
         return Qt::WindowMinimized;
     if (window.qt_fullScreen)
         return Qt::WindowFullScreen;
-    if ((window.zoomed && !isTransitioningToFullScreen())
+    if ((NSWINPROPERTY(window, zoomed, isZoomed) && !isTransitioningToFullScreen())
         || (m_lastReportedWindowState == Qt::WindowMaximized && isTransitioningToFullScreen()))
         return Qt::WindowMaximized;
 
@@ -2229 +2242 @@
 
     QMacAutoReleasePool pool;
 
+#if !__has_builtin(__builtin_available)  // #if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
+    bool hasTitlebarAppearsTransparent = [window respondsToSelector:@selector(setTitlebarAppearsTransparent:)];
+#endif
+
     if (!m_drawContentBorderGradient) {
         [window setStyleMask:[window styleMask] & ~NSTexturedBackgroundWindowMask];
         [[[window contentView] superview] setNeedsDisplay:YES];
-        window.titlebarAppearsTransparent = NO;
+#if __has_builtin(__builtin_available)  // #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
+        if (__builtin_available(macOS 10.10, *)) {
+            window.titlebarAppearsTransparent = NO;
+        }
+#else
+        if (hasTitlebarAppearsTransparent) {
+            [window setTitlebarAppearsTransparent:NO];
+        }
+#endif
         return;
     }
 
@@ -2257 +2282 @@
     int effectiveBottomContentBorderThickness = m_bottomContentBorderThickness;
 
     [window setStyleMask:[window styleMask] | NSTexturedBackgroundWindowMask];
-    window.titlebarAppearsTransparent = YES;
+#if __has_builtin(__builtin_available)  // #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
+    if (__builtin_available(macOS 10.10, *)) {
+        window.titlebarAppearsTransparent = YES;
+    }
+#else
+    if (hasTitlebarAppearsTransparent) {
+        [window setTitlebarAppearsTransparent:YES];
+    }
+#endif
 
     [window setContentBorderThickness:effectiveTopContentBorderThickness forEdge:NSMaxYEdge];
     [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];