Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Fix build break in S60 5.0 environment
  Skip softkeys update if application is not on foreground in Symbian
  Revert "Opening taskswitcher, pushes application softkeys to top of switcher"

1 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 57893f9..a866da3 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -48,9 +48,6 @@
 
 #ifdef Q_WS_S60
 #include "private/qsoftkeymanager_s60_p.h"
-#endif
-
-#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4)
 #include "private/qt_s60_p.h"
 #endif
 
@@ -193,11 +190,14 @@ 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);
-    }
+#ifdef Q_WS_S60
+    // Do not adjust softkeys if application is not the topmost one
+    if (S60->wsSession().GetFocusWindowGroup() != S60->windowGroup().WindowGroupId())
+        return;
+#endif
+    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)