diff options
author | Janne Anttila <janne.anttila@digia.com> | 2010-09-08 12:26:23 (GMT) |
---|---|---|
committer | Janne Anttila <janne.anttila@digia.com> | 2010-09-08 12:35:19 (GMT) |
commit | e6cdf5833655f6bf4fae3166b2c1955e56cfc9a1 (patch) | |
tree | 435deb35f7bf33579d6d316eef48ea55d06e37a6 /src/gui/kernel | |
parent | 0937787432958defd6b9c664323ed6ea1a91083d (diff) | |
download | Qt-e6cdf5833655f6bf4fae3166b2c1955e56cfc9a1.zip Qt-e6cdf5833655f6bf4fae3166b2c1955e56cfc9a1.tar.gz Qt-e6cdf5833655f6bf4fae3166b2c1955e56cfc9a1.tar.bz2 |
Let's not duplicate Symbian softkey menu top-level actions in submenu.
The old code incorrectly added the toplevel menu to menubar, where as
submenu should have been added. This change only has impact to case
where menu is being manually constructed by creating softkey action
with menu and by adding actions to that menu. Normal "Options" menus
are already working correctly.
Task-number: QTBUG-12189
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qsoftkeymanager_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp index 6325d95..fee1580 100644 --- a/src/gui/kernel/qsoftkeymanager_s60.cpp +++ b/src/gui/kernel/qsoftkeymanager_s60.cpp @@ -401,7 +401,7 @@ bool QSoftKeyManagerPrivateS60::handleCommand(int command) foreach(QAction *menuAction, action->menu()->actions()) { QMenu *menu = menuAction->menu(); if(menu) - menuBar->addMenu(action->menu()); + menuBar->addMenu(menu); else menuBar->addAction(menuAction); } |