summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qsoftkeymanager.cpp
diff options
context:
space:
mode:
authorSami Merilä <sami.merila@nokia.com>2009-09-28 13:24:48 (GMT)
committerSami Merilä <sami.merila@nokia.com>2009-09-28 13:24:48 (GMT)
commit3a52aeb622da3f7d4171ea64df7896fa5d2d7d4a (patch)
treeb506f888fb69c3ca83ebdbba64a9ac9df83a9480 /src/gui/kernel/qsoftkeymanager.cpp
parent726ce1dcba37d85bc743559e1b882a72413d1d82 (diff)
downloadQt-3a52aeb622da3f7d4171ea64df7896fa5d2d7d4a.zip
Qt-3a52aeb622da3f7d4171ea64df7896fa5d2d7d4a.tar.gz
Qt-3a52aeb622da3f7d4171ea64df7896fa5d2d7d4a.tar.bz2
Triggering softkey action for disbled widget causes a crash.
Softkey actions need to copy enable state from action widget to prevent crash when action is triggered and action widget is disabled. OPEN: dynamically setting enable state for softkey actions. Task-number: QT-2117 Reviewed-by: Jason Barron
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager.cpp')
-rw-r--r--src/gui/kernel/qsoftkeymanager.cpp7
1 files changed, 5 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++;
}