summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qsoftkeymanager.cpp
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2011-05-19 08:40:13 +0300
committerSami Merila <sami.merila@nokia.com>2011-05-19 08:40:13 +0300
commit38d04b8cd5a26564945b833450a104fe82d97e14 (patch)
tree954c1c9d6116660c8d304bca50e6daba30716360 /src/gui/kernel/qsoftkeymanager.cpp
parentb8ff438747c620c6ed3d93c841d4f148f2087520 (diff)
Opening taskswitcher, pushes application softkeys to top of switcher
If application does not have active window, do not update CBA, since this causes the CBA to become on foreground. Task-number: QTBUG-19225 Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager.cpp')
-rw-r--r--src/gui/kernel/qsoftkeymanager.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 204efe9ee9..c51df9b2b3 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -193,9 +193,11 @@ void QSoftKeyManager::sendKeyEvent()
void QSoftKeyManager::updateSoftKeys()
{
- QSoftKeyManager::instance()->d_func()->pendingUpdate = true;
- QEvent *event = new QEvent(QEvent::UpdateSoftKeys);
- QApplication::postEvent(QSoftKeyManager::instance(), event);
+ if (QApplication::activeWindow()) {
+ QSoftKeyManager::instance()->d_func()->pendingUpdate = true;
+ QEvent *event = new QEvent(QEvent::UpdateSoftKeys);
+ QApplication::postEvent(QSoftKeyManager::instance(), event);
+ }
}
bool QSoftKeyManager::appendSoftkeys(const QWidget &source, int level)