diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-17 13:51:46 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-17 13:51:46 (GMT) |
| commit | d9911390f17426801f553cb82654e102fe0400b9 (patch) | |
| tree | 5c0dd218d44d0989761c01007d128de2d0e60f4c /src/gui/kernel/qapplication_s60.cpp | |
| parent | 75140c4776934744c37a34b10b7d4b8665aa4dc1 (diff) | |
| parent | 06346d241d3a66bb488addcacae8a6e0d0d6e59c (diff) | |
| download | Qt-d9911390f17426801f553cb82654e102fe0400b9.zip Qt-d9911390f17426801f553cb82654e102fe0400b9.tar.gz Qt-d9911390f17426801f553cb82654e102fe0400b9.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/kernel/qapplication_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 9a2bbe6..3bd6e6b 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1075,9 +1075,10 @@ void QApplication::symbianHandleCommand(int command) default: if (command >= SOFTKEYSTART && command <= SOFTKEYEND) { int index= command-SOFTKEYSTART; - QWidget* focused = QApplication::focusWidget(); - const QList<QAction*>& softKeys = focused->softKeys(); - Q_ASSERT(index<softKeys.count()); + QWidget *focused = QApplication::focusWidget(); + QWidget *softKeySource = focused ? focused : QApplication::activeWindow(); + const QList<QAction*>& softKeys = softKeySource->softKeys(); + Q_ASSERT(index < softKeys.count()); softKeys.at(index)->activate(QAction::Trigger); } else |