summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-06-17 12:03:38 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-06-17 12:03:38 (GMT)
commitd8752a037bb8799895f33cc21a0206eca3b89350 (patch)
tree9e6dc9bfa2dc686f663956629611227af5a85ca2 /src/gui/kernel
parent0cbe134b84f03f6490f6034ddfc0bf69699dd91f (diff)
downloadQt-d8752a037bb8799895f33cc21a0206eca3b89350.zip
Qt-d8752a037bb8799895f33cc21a0206eca3b89350.tar.gz
Qt-d8752a037bb8799895f33cc21a0206eca3b89350.tar.bz2
Revert "Opening taskswitcher, pushes application softkeys to top of switcher"
This reverts commit 38d04b8cd5a26564945b833450a104fe82d97e14. The above commit was reverted as it caused regression, the problem described in task QTBUG-6115 was reintroduced.
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qsoftkeymanager.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 57893f9..1150601 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -193,11 +193,9 @@ void QSoftKeyManager::sendKeyEvent()
void QSoftKeyManager::updateSoftKeys()
{
- if (QApplication::activeWindow()) {
- QSoftKeyManager::instance()->d_func()->pendingUpdate = true;
- QEvent *event = new QEvent(QEvent::UpdateSoftKeys);
- QApplication::postEvent(QSoftKeyManager::instance(), event);
- }
+ 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)