diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2010-03-12 11:32:38 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2010-03-12 11:36:11 (GMT) |
| commit | 7829fe1507741c7196fe3904d90ea10178625393 (patch) | |
| tree | 2062721f23dc7e8bb0c9d234058c6bb3602a1855 /src/gui/widgets/qmenubar_p.h | |
| parent | 76c0bc4f95fce3c5fd9f77b778180d1b50b2b095 (diff) | |
| download | Qt-7829fe1507741c7196fe3904d90ea10178625393.zip Qt-7829fe1507741c7196fe3904d90ea10178625393.tar.gz Qt-7829fe1507741c7196fe3904d90ea10178625393.tar.bz2 | |
Moved softkey "Options" action handling from QMainWindow to QMenuBar.
This change is done to enable QMenuBar usage and related "Options"
softkey also on other than QMainWindow objects. For example with this
change it is possible to create menubar and set it to QLayout by using
setMenuBar, and it will then be usable via "Options" softkey.
This functionality makes it easy to use different menus for different
views in QStackedWidget.
Task-number: QT-2275 (Not yet finished, but related)
Reviewed-by: Sami Merila
Reviewed-by: Alessandro Portale
Diffstat (limited to 'src/gui/widgets/qmenubar_p.h')
| -rw-r--r-- | src/gui/widgets/qmenubar_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h index f2e5357..e4db6ce 100644 --- a/src/gui/widgets/qmenubar_p.h +++ b/src/gui/widgets/qmenubar_p.h @@ -243,6 +243,7 @@ public: #ifdef Q_WS_S60 void symbianCreateMenuBar(QWidget *); void symbianDestroyMenuBar(); + void reparentMenuBar(QWidget *oldParent, QWidget *newParent); struct QSymbianMenuBarPrivate { QList<QSymbianMenuAction*> actionItems; QMenuBarPrivate *d; @@ -267,7 +268,9 @@ public: } *symbian_menubar; static int symbianCommands(int command); - +#ifdef QT_SOFTKEYS_ENABLED + QAction *menuBarAction; +#endif #endif }; #endif |