Ticket #36591: patch-qt4-mac.diff

Portfile

@@ -216 +216 @@
 patchfiles-append   \
     patch-tools_macdeployqt_shared_shared.cpp.diff
 
+# (25) temporary fix for Mac menu state; will be removed with 4.8.4.
+
+patchfiles-append   \
+    patch-4.8.4-osx-native-menu-state-fix.diff
+
 ###############################################
 
 # disable CCACHE for now (ticket #34856)

files/patch-4.8.4-osx-native-menu-state-fix.diff

@@ +1 @@
+--- src/gui/widgets/qmenu.cpp.orig
++++ src/gui/widgets/qmenu.cpp
+@@ -2387,7 +2387,7 @@ void QMenu::changeEvent(QEvent *e)
+         if (d->tornPopup) // torn-off menu
+             d->tornPopup->setEnabled(isEnabled());
+         d->menuAction->setEnabled(isEnabled());
+-#ifdef Q_WS_MAC
++#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
+         if (d->mac_menu)
+             d->setMacMenuEnabled(isEnabled());
+ #endif
+--- src/gui/widgets/qmenu_mac.mm.orig
++++ src/gui/widgets/qmenu_mac.mm
+@@ -1554,6 +1554,7 @@ QMenuPrivate::syncSeparatorsCollapsible(bool collapse)
+ 
+ 
+ 
++#ifndef QT_MAC_USE_COCOA
+ /*!
+   \internal
+ */
+@@ -1567,26 +1568,16 @@ void QMenuPrivate::setMacMenuEnabled(bool enable)
+         for (int i = 0; i < mac_menu->actionItems.count(); ++i) {
+             QMacMenuAction *menuItem = mac_menu->actionItems.at(i);
+             if (menuItem && menuItem->action && menuItem->action->isEnabled()) {
+-#ifndef QT_MAC_USE_COCOA
+                 // Only enable those items which contains an enabled QAction.
+                 // i == 0 -> the menu itself, hence i + 1 for items.
+                 EnableMenuItem(mac_menu->menu, i + 1);
+-#else
+-                [menuItem->menuItem setEnabled:true];
+-#endif
+             }
+         }
+     } else {
+-#ifndef QT_MAC_USE_COCOA
+         DisableAllMenuItems(mac_menu->menu);
+-#else
+-        NSMenu *menu = mac_menu->menu;
+-        for (NSMenuItem *item in [menu itemArray]) {
+-            [item setEnabled:false];
+-        }
+-#endif
+     }
+ }
++#endif
+ 
+ /*!
+     \internal
+@@ -1744,6 +1735,7 @@ QMenuBarPrivate::QMacMenuBarPrivate::syncAction(QMacMenuAction *action)
+         [item setSubmenu: submenu];
+         [submenu setTitle:qt_mac_QStringToNSString(qt_mac_removeMnemonics(action->action->text()))];
+         syncNSMenuItemVisiblity(item, visible);
++        syncNSMenuItemEnabled(item, action->action->isEnabled());
+ #endif
+         if (release_submenu) { //no pointers to it
+ #ifndef QT_MAC_USE_COCOA
+@@ -1846,6 +1838,7 @@ OSMenuRef QMenuBarPrivate::macMenu()
+         return 0;
+     } else if (!mac_menubar->menu) {
+         mac_menubar->menu = qt_mac_create_menu(q);
++        [mac_menubar->menu setAutoenablesItems:NO];
+         ProcessSerialNumber mine, front;
+         if (GetCurrentProcess(&mine) == noErr && GetFrontProcess(&front) == noErr) {
+             if (!qt_mac_no_menubar_merge && !mac_menubar->apple_menu) {
+--- src/gui/widgets/qmenu_p.h.orig
++++ src/gui/widgets/qmenu_p.h
+@@ -327,7 +327,9 @@ public:
+         }
+     } *mac_menu;
+     OSMenuRef macMenu(OSMenuRef merge);
++#ifndef QT_MAC_USE_COCOA
+     void setMacMenuEnabled(bool enable = true);
++#endif
+     void syncSeparatorsCollapsible(bool collapsible);
+     static QHash<OSMenuRef, OSMenuRef> mergeMenuHash;
+     static QHash<OSMenuRef, QMenuMergeList*> mergeMenuItemsHash;