Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev

1 files changed, 15 insertions, 18 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.mm b/src/plugins/platforms/cocoa/qcocoamenuloader.mm
index 345b370826..5610c36ea1 100644
--- a/src/plugins/platforms/cocoa/qcocoamenuloader.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenuloader.mm
@@ -213,26 +213,23 @@
     Q_ASSERT(mainMenu);
 #endif
     // Grab the app menu out of the current menu.
-    const int numItems = mainMenu.numberOfItems;
-    NSMenuItem *oldAppMenuItem = nil;
-    for (int i = 0; i < numItems; ++i) {
-        NSMenuItem *item = [mainMenu itemAtIndex:i];
-        if (item.submenu == appMenu) {
-            oldAppMenuItem = item;
-            [oldAppMenuItem retain];
-            [mainMenu removeItemAtIndex:i];
-            break;
+    auto unparentAppMenu = ^bool (NSMenu *supermenu) {
+        auto index = [supermenu indexOfItemWithSubmenu:appMenu];
+        if (index != -1) {
+            [supermenu removeItemAtIndex:index];
+            return true;
         }
-    }
+        return false;
+    };
 
-    if (oldAppMenuItem) {
-        oldAppMenuItem.submenu = nil;
-        [oldAppMenuItem release];
-        NSMenuItem *appMenuItem = [[NSMenuItem alloc] initWithTitle:@"Apple"
-                                                      action:nil keyEquivalent:@""];
-        appMenuItem.submenu = appMenu;
-        [menu insertItem:appMenuItem atIndex:0];
-    }
+    if (!mainMenu || !unparentAppMenu(mainMenu))
+        if (appMenu.supermenu)
+            unparentAppMenu(appMenu.supermenu);
+
+    NSMenuItem *appMenuItem = [[NSMenuItem alloc] initWithTitle:@"Apple"
+                               action:nil keyEquivalent:@""];
+    appMenuItem.submenu = appMenu;
+    [menu insertItem:appMenuItem atIndex:0];
 }
 
 - (NSMenu *)menu