From e9ca540112b0fdd0d8122f7f9cc9c297016de68b Mon Sep 17 00:00:00 2001
From: Markku Luukkainen <markku.luukkainen@digia.com>
Date: Mon, 11 May 2009 16:12:23 +0200
Subject: Changed implementation to use QMultiHash instead of QHash. Fixes a
 bug when setting a new menubar to QMainWindow

---
 src/gui/widgets/qmenu_symbian.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index 4c8b4ae..d329cd5 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -32,7 +32,7 @@
 QT_BEGIN_NAMESPACE
 
 // ### FIX/Document this, we need some safe range of menu id's for Qt that don't clash with AIW ones
-typedef QHash<QWidget *, QMenuBarPrivate *> MenuBarHash;
+typedef QMultiHash<QWidget *, QMenuBarPrivate *> MenuBarHash;
 Q_GLOBAL_STATIC(MenuBarHash, menubars)
 
 #define QT_FIRST_MENU_ITEM 32000
@@ -272,7 +272,7 @@ void QMenuBarPrivate::symbianDestroyMenuBar()
     Q_Q(QMenuBar);
     int index = nativeMenuBars.indexOf(q);
     nativeMenuBars.removeAt(index);
-    menubars()->remove(q->window());
+    menubars()->remove(q->window(), this);
     rebuildMenu();
     if (symbian_menubar)
         delete symbian_menubar;
-- 
cgit v0.12