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

1 files changed, 10 insertions, 8 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm
index da2704f19c..0fea55ac68 100644
--- a/src/plugins/platforms/cocoa/qcocoamenubar.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm
@@ -149,15 +149,17 @@ void QCocoaMenuBar::syncMenu(QPlatformMenu *menu)
     Q_FOREACH (QCocoaMenuItem *item, cocoaMenu->items())
         cocoaMenu->syncMenuItem(item);
 
-    // If the NSMenu has no visble items, or only separators, we should hide it
-    // on the menubar. This can happen after syncing the menu items since they
-    // can be moved to other menus.
     BOOL shouldHide = YES;
-    for (NSMenuItem *item in [cocoaMenu->nsMenu() itemArray])
-        if (![item isSeparatorItem] && ![item isHidden]) {
-            shouldHide = NO;
-            break;
-        }
+    if (cocoaMenu->isVisible()) {
+        // If the NSMenu has no visble items, or only separators, we should hide it
+        // on the menubar. This can happen after syncing the menu items since they
+        // can be moved to other menus.
+        for (NSMenuItem *item in [cocoaMenu->nsMenu() itemArray])
+            if (![item isSeparatorItem] && ![item isHidden]) {
+                shouldHide = NO;
+                break;
+            }
+    }
     [cocoaMenu->nsMenuItem() setHidden:shouldHide];
 }