diff options
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index ed6f4c9..0b5f56a 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -224,7 +224,9 @@ void QSoftKeyManagerPrivate::updateSoftKeys_sys(const QList<QAction*> &softkeys) break; } - command = s60CommandStart + index; + command = (softKeyAction->objectName().contains("_q_menuSoftKeyAction")) + ? EAknSoftkeyOptions + : s60CommandStart + index; if (position != -1) { TPtrC text = qt_QString2TPtrC(softKeyAction->text()); diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 227a179..0947e1b 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -119,6 +119,7 @@ void QMainWindowPrivate::init() q->setAttribute(Qt::WA_Hover); #ifdef QT_SOFTKEYS_ENABLED menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::MenuSoftKey, q); + menuBarAction->setObjectName("_q_menuSoftKeyAction"); #endif } |