diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-12 13:24:43 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-12 13:24:43 (GMT) |
| commit | 61b111228d0abf66130b229fcb6c5e2a54faecbf (patch) | |
| tree | 68902f30a1f6f61e702db6f54a9ce9af8ae4e946 /src/gui/widgets/qmenu_symbian.cpp | |
| parent | 6df45530173fe9b6af0602adbd9163c39a2bc935 (diff) | |
| download | Qt-61b111228d0abf66130b229fcb6c5e2a54faecbf.zip Qt-61b111228d0abf66130b229fcb6c5e2a54faecbf.tar.gz Qt-61b111228d0abf66130b229fcb6c5e2a54faecbf.tar.bz2 | |
Removed setting native softkeys from menu implementation as from
now on the menu softkey will be set by the brand new softkey stack.
Diffstat (limited to 'src/gui/widgets/qmenu_symbian.cpp')
| -rw-r--r-- | src/gui/widgets/qmenu_symbian.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp index aee55b9..1dc727c 100644 --- a/src/gui/widgets/qmenu_symbian.cpp +++ b/src/gui/widgets/qmenu_symbian.cpp @@ -173,21 +173,9 @@ void deleteAll(QList<SymbianMenuItem*> *items) } } -static void setSoftkeys() -{ - CEikButtonGroupContainer* cba = CEikonEnv::Static()->AppUiFactory()->Cba(); - if (cba){ - if (menuExists()) - cba->SetCommandSetL(R_AVKON_SOFTKEYS_OPTIONS_EXIT); - else - cba->SetCommandSetL(R_AVKON_SOFTKEYS_EXIT); - } -} - static void rebuildMenu() { QMenuBarPrivate *mb = 0; - setSoftkeys(); QWidget *w = qApp->activeWindow(); if (w) { @@ -372,7 +360,6 @@ void QMenuBarPrivate::QSymbianMenuBarPrivate::removeAction(QSymbianMenuAction *a void QMenuBarPrivate::QSymbianMenuBarPrivate::rebuild() { - setSoftkeys(); qt_symbian_menu_static_cmd_id = QT_FIRST_MENU_ITEM; deleteAll( &symbianMenus ); if (!d) |