diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-11 14:12:23 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-11 14:12:23 (GMT) |
| commit | e9ca540112b0fdd0d8122f7f9cc9c297016de68b (patch) | |
| tree | af6f52f798f6b9c3466731bfafd637529b9dc530 /src/gui/widgets/qmenu_symbian.cpp | |
| parent | 05cd23af6f7e729e564e8ed2f47a8e9890d3f222 (diff) | |
| download | Qt-e9ca540112b0fdd0d8122f7f9cc9c297016de68b.zip Qt-e9ca540112b0fdd0d8122f7f9cc9c297016de68b.tar.gz Qt-e9ca540112b0fdd0d8122f7f9cc9c297016de68b.tar.bz2 | |
Changed implementation to use QMultiHash instead of QHash.
Fixes a bug when setting a new menubar to QMainWindow
Diffstat (limited to 'src/gui/widgets/qmenu_symbian.cpp')
| -rw-r--r-- | src/gui/widgets/qmenu_symbian.cpp | 4 |
1 files 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; |