Prevent menubar related crashes

The native menubar interface does not communicate menubar destruction
down to the implementation, so we cannot keep naked pointers (otherwise
they become dangling). This happens often while running autotests as
windows, menus, widgets, etc. are quickly created, tested, and then
destroyed.

Work-around the crashes for now by using QWeakPointer. A proper fix will
need to be investigated to prevent the menubars hash from holding
dangling key pointers.

Change-Id: Ie8e50cbc52f9510e844fc3c0c5ae6a0865320282
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/platforms/cocoa/qmenu_mac.mm b/src/plugins/platforms/cocoa/qmenu_mac.mm
index db6dda79f1..88a668aa65 100644
--- a/src/plugins/platforms/cocoa/qmenu_mac.mm
+++ b/src/plugins/platforms/cocoa/qmenu_mac.mm
@@ -776,9 +776,9 @@ void QCocoaMenu::setMenuEnabled(bool enable)
 /*****************************************************************************
   QMenuBar bindings
  *****************************************************************************/
-typedef QHash<QWidget *, QMenuBar *> MenuBarHash;
+typedef QHash<QWidget *, QWeakPointer<QMenuBar> > MenuBarHash;
 Q_GLOBAL_STATIC(MenuBarHash, menubars)
-static QMenuBar *fallback = 0;
+static QWeakPointer<QMenuBar> fallback;
 
 QCocoaMenuBar::QCocoaMenuBar(QMenuBar *a_qtMenuBar) : menu(0), apple_menu(0), qtMenuBar(a_qtMenuBar)
 {
@@ -956,8 +956,8 @@ void QCocoaMenuBar::macCreateMenuBar(QWidget *parent)
 void QCocoaMenuBar::macDestroyMenuBar()
 {
     QCocoaAutoReleasePool pool;
-    if (fallback == qtMenuBar)
-        fallback = 0;
+    if (fallback.data() == qtMenuBar)
+        fallback.clear();
     QWidget *tlw = qtMenuBar->window();
     menubars()->remove(tlw);
 
@@ -1038,7 +1038,7 @@ static bool qt_mac_should_disable_menu(QMenuBar *menuBar)
     if (!modalWidget)
         return false;
 
-    if (menuBar && menuBar == menubars()->value(modalWidget))
+    if (menuBar && menuBar == menubars()->value(modalWidget).data())
         // The menu bar is owned by the modal widget.
         // In that case we should enable it:
         return false;
@@ -1098,7 +1098,7 @@ static QMenuBar *findMenubarForWindow(QWidget *w)
 {
     QMenuBar *mb = 0;
     if (w) {
-        mb = menubars()->value(w);
+        mb = menubars()->value(w).data();
 
 #if 0
 // ###
@@ -1111,13 +1111,13 @@ static QMenuBar *findMenubarForWindow(QWidget *w)
         }
 #endif
         while(w && !mb)
-            mb = menubars()->value((w = w->parentWidget()));
+            mb = menubars()->value((w = w->parentWidget())).data();
     }
 
     if (!mb) {
         // We could not find a menu bar for the window. Lets
         // check if we have a global (parentless) menu bar instead:
-        mb = fallback;
+        mb = fallback.data();
     }
 
     return mb;