diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2010-02-03 09:37:24 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2010-02-03 09:37:24 (GMT) |
| commit | 2a8d20453926082062246fc4cc788f88ea3c59ae (patch) | |
| tree | 199b6e57afbf3bfb6b97eb5ac043ef658daf8ed6 /src/gui/widgets/qmainwindow.cpp | |
| parent | 8e87feefc0a92fbbeb1846f2471cdded9ef901ff (diff) | |
| download | Qt-2a8d20453926082062246fc4cc788f88ea3c59ae.zip Qt-2a8d20453926082062246fc4cc788f88ea3c59ae.tar.gz Qt-2a8d20453926082062246fc4cc788f88ea3c59ae.tar.bz2 | |
S60 softkey refactoring (support for merging, priorities and menus)
Implemented features:
Softkey Merging:
Widget can set only one softkey and set flag that rest of the softkeys
shall be taken from parent.
Priority Handling:
If multiple sokftkeys with same role are set, the highest priority
action gets displayed.
Custom Softkey Menu:
By setting QMenu to QAction and assigning a softkey role for that
action, the native menubar will be displayed when sofkey is clicked.
Softkey Image:
Initial code for implementing sofkey image support, the final
implementation is still pending legal acceptance to use
eiksoftkeyimage.h header file which is under EPL license.
Task-number: QTBUG-7315
Review-By: Sami Merila
Review-By: Jason Barron
Diffstat (limited to 'src/gui/widgets/qmainwindow.cpp')
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 1622191..269cd12 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -119,8 +119,6 @@ void QMainWindowPrivate::init() q->setAttribute(Qt::WA_Hover); #ifdef QT_SOFTKEYS_ENABLED menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::MenuSoftKey, q); - menuBarAction->setObjectName(QLatin1String("_q_menuSoftKeyAction")); - menuBarAction->setVisible(false); #endif } |