diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 7 | ||||
| -rw-r--r-- | src/gui/widgets/qdialogbuttonbox.cpp | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 7874622..91f4163 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -125,6 +125,7 @@ QAction *QSoftKeyManager::createAction(StandardSoftKey standardKey, QWidget *act break; } action->setSoftKeyRole(softKeyRole); + action->setEnabled(actionWidget->isEnabled()); return action; } @@ -251,8 +252,10 @@ bool QSoftKeyManager::handleCommand(int command) QAction *action = softKeys.at(i); if (action->softKeyRole() != QAction::NoSoftKey) { if (j == index) { - action->activate(QAction::Trigger); - return true; + if (action->isEnabled()) { + action->activate(QAction::Trigger); + return true; + } } j++; } diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp index 39566ef..6cc720d 100644 --- a/src/gui/widgets/qdialogbuttonbox.cpp +++ b/src/gui/widgets/qdialogbuttonbox.cpp @@ -593,6 +593,7 @@ QAction* QDialogButtonBoxPrivate::createSoftKey(QAbstractButton *button, QDialog } QObject::connect(action, SIGNAL(triggered()), button, SIGNAL(clicked())); action->setSoftKeyRole(softkeyRole); + action->setEnabled(button->isEnabled()); return action; } #endif |