3 files changed, 34 insertions, 0 deletions
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp
index 2fa3b45047..73d8cb2007 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@@ -448,6 +448,8 @@ void QQnxIntegration::createDisplays()
                          screen, SLOT(windowClosed(void *)));
 
         QObject::connect(m_navigatorEventHandler, SIGNAL(rotationChanged(int)), screen, SLOT(setRotation(int)));
+        QObject::connect(m_navigatorEventHandler, SIGNAL(windowGroupActivated(QByteArray)), screen, SLOT(activateWindowGroup(QByteArray)));
+        QObject::connect(m_navigatorEventHandler, SIGNAL(windowGroupDeactivated(QByteArray)), screen, SLOT(deactivateWindowGroup(QByteArray)));
     }
 }
 
diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp
index 27c1357a87..ea0c9e340f 100644
--- a/src/plugins/platforms/qnx/qqnxscreen.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreen.cpp
@@ -348,4 +348,34 @@ void QQnxScreen::windowClosed(void *window)
     removeOverlayWindow(windowHandle);
 }
 
+void QQnxScreen::activateWindowGroup(const QByteArray &id)
+{
+#if defined(QQNXSCREEN_DEBUG)
+    qDebug() << Q_FUNC_INFO;
+#endif
+
+    if (!rootWindow() || id != rootWindow()->groupName())
+        return;
+
+    if (!m_childWindows.isEmpty()) {
+        // We're picking up the last window of the list here
+        // because this list is ordered by stacking order.
+        // Last window is effectively the one on top.
+        QWindow * const window = m_childWindows.last()->window();
+        QWindowSystemInterface::handleWindowActivated(window);
+    }
+}
+
+void QQnxScreen::deactivateWindowGroup(const QByteArray &id)
+{
+#if defined(QQNXSCREEN_DEBUG)
+    qDebug() << Q_FUNC_INFO;
+#endif
+
+    if (!rootWindow() || id != rootWindow()->groupName())
+        return;
+
+    QWindowSystemInterface::handleWindowActivated(0);
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxscreen.h b/src/plugins/platforms/qnx/qqnxscreen.h
index 272cdd6261..7816661323 100644
--- a/src/plugins/platforms/qnx/qqnxscreen.h
+++ b/src/plugins/platforms/qnx/qqnxscreen.h
@@ -94,6 +94,8 @@ public Q_SLOTS:
     void setRotation(int rotation);
     void newWindowCreated(void *window);
     void windowClosed(void *window);
+    void activateWindowGroup(const QByteArray &id);
+    void deactivateWindowGroup(const QByteArray &id);
 
 private Q_SLOTS:
     void keyboardHeightChanged(int height);