1 files changed, 20 insertions, 7 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm
index 764a01370d..7775cdbde6 100644
--- a/src/plugins/platforms/cocoa/qcocoamenubar.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm
@@ -37,7 +37,7 @@
 #include "qcocoawindow.h"
 #include "qcocoamenuloader.h"
 #include "qcocoaapplication.h" // for custom application category
-#include "qcocoaautoreleasepool.h"
+#include "qcocoaapplicationdelegate.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtCore/QDebug>
@@ -83,7 +83,7 @@ QCocoaMenuBar::~QCocoaMenuBar()
 
 void QCocoaMenuBar::insertNativeMenu(QCocoaMenu *menu, QCocoaMenu *beforeMenu)
 {
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
 
     if (beforeMenu) {
         NSUInteger nativeIndex = [m_nativeMenu indexOfItem:beforeMenu->nsMenuItem()];
@@ -126,7 +126,7 @@ void QCocoaMenuBar::insertMenu(QPlatformMenu *platformMenu, QPlatformMenu *befor
 
 void QCocoaMenuBar::removeNativeMenu(QCocoaMenu *menu)
 {
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
 
     if (menu->menuBar() == this)
         menu->setMenuBar(0);
@@ -147,7 +147,7 @@ void QCocoaMenuBar::removeMenu(QPlatformMenu *platformMenu)
 
 void QCocoaMenuBar::syncMenu(QPlatformMenu *menu)
 {
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
 
     QCocoaMenu *cocoaMenu = static_cast<QCocoaMenu *>(menu);
     Q_FOREACH (QCocoaMenuItem *item, cocoaMenu->items())
@@ -260,13 +260,26 @@ void QCocoaMenuBar::resetKnownMenuItemsToQt()
 
 void QCocoaMenuBar::updateMenuBarImmediately()
 {
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
     QCocoaMenuBar *mb = findGlobalMenubar();
     QCocoaWindow *cw = findWindowForMenubar();
 
     QWindow *win = cw ? cw->window() : 0;
-    if (win && (win->flags() & Qt::Popup) == Qt::Popup)
-        return; // context menus, comboboxes, etc. don't need to update the menubar
+    if (win && (win->flags() & Qt::Popup) == Qt::Popup) {
+        // context menus, comboboxes, etc. don't need to update the menubar,
+        // but if an application has only Qt::Tool window(s) on start,
+        // we still have to update the menubar.
+        if ((win->flags() & Qt::WindowType_Mask) != Qt::Tool)
+            return;
+        typedef QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) AppDelegate;
+        NSApplication *app = [NSApplication sharedApplication];
+        if (![app.delegate isKindOfClass:[AppDelegate class]])
+            return;
+        // We apply this logic _only_ during the startup.
+        AppDelegate *appDelegate = app.delegate;
+        if (!appDelegate.inLaunch)
+            return;
+    }
 
     if (cw && cw->menubar())
         mb = cw->menubar();