diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-13 09:41:21 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-13 09:46:38 (GMT) |
| commit | 6433302cf96b64460cbcd770d8cb703f29a001ad (patch) | |
| tree | 2e838343c8d7510bab5590467aaf8a6320184486 /src/gui/kernel/qsoftkeymanager_s60.cpp | |
| parent | be16b3def01783e693883c0990f73c815042b1e7 (diff) | |
| download | Qt-6433302cf96b64460cbcd770d8cb703f29a001ad.zip Qt-6433302cf96b64460cbcd770d8cb703f29a001ad.tar.gz Qt-6433302cf96b64460cbcd770d8cb703f29a001ad.tar.bz2 | |
Improve handling of QAction in soft key manager
It also reduces QActionPrivate by 16 bytes.
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_s60.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp index c0761f0..fbe5888 100644 --- a/src/gui/kernel/qsoftkeymanager_s60.cpp +++ b/src/gui/kernel/qsoftkeymanager_s60.cpp @@ -46,6 +46,7 @@ #include "qmenubar.h" #include "private/qt_s60_p.h" #include "private/qmenu_p.h" +#include "private/qaction_p.h" #include "private/qsoftkeymanager_p.h" #include "private/qsoftkeymanager_s60_p.h" #include "private/qobject_p.h" @@ -382,8 +383,8 @@ bool QSoftKeyManagerPrivateS60::handleCommand(int command) { QAction *action = realSoftKeyActions.value(command); if (action) { - QVariant property = action->property(MENU_ACTION_PROPERTY); - if (property.isValid() && property.toBool()) { + bool property = QActionPrivate(action)->menuActionSoftkeys; + if (property) { QT_TRAP_THROWING(tryDisplayMenuBarL()); } else if (action->menu()) { // TODO: This is hack, in order to use exising QMenuBar implementation for Symbian |