4 files changed, 50 insertions, 13 deletions

diff --git a/src/plugins/platforms/qnx/qqnxnativeinterface.cpp b/src/plugins/platforms/qnx/qqnxnativeinterface.cpp
index d1ceebfebc..df9d96739a 100644
--- a/src/plugins/platforms/qnx/qqnxnativeinterface.cpp
+++ b/src/plugins/platforms/qnx/qqnxnativeinterface.cpp
@@ -88,9 +88,15 @@ void *QQnxNativeInterface::nativeResourceForContext(const QByteArray &resource,
 
 void QQnxNativeInterface::setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value)
 {
+    QQnxWindow *qnxWindow = static_cast<QQnxWindow*>(window);
+
     if (name == QStringLiteral("mmRendererWindowName")) {
-        QQnxWindow *qnxWindow = static_cast<QQnxWindow*>(window);
         qnxWindow->setMMRendererWindowName(value.toString());
+    } else if (name == QStringLiteral("windowGroup")) {
+        if (value.isNull())
+            qnxWindow->joinWindowGroup(QByteArray());
+        else if (value.canConvert<QByteArray>())
+            qnxWindow->joinWindowGroup(value.toByteArray());
     }
 }
 
diff --git a/src/plugins/platforms/qnx/qqnxscreen.h b/src/plugins/platforms/qnx/qqnxscreen.h
index 61c47e6c72..d39a210d4b 100644
--- a/src/plugins/platforms/qnx/qqnxscreen.h
+++ b/src/plugins/platforms/qnx/qqnxscreen.h
@@ -80,7 +80,7 @@ public:
     int nativeFormat() const { return (depth() == 32) ? SCREEN_FORMAT_RGBA8888 : SCREEN_FORMAT_RGB565; }
     screen_display_t nativeDisplay() const { return m_display; }
     screen_context_t nativeContext() const { return m_screenContext; }
-    const char *windowGroupName() const { return rootWindow()->groupName().constData(); }
+    const char *windowGroupName() const { return m_rootWindow ? m_rootWindow->groupName().constData() : 0; }
 
     QQnxWindow *findWindow(screen_window_t windowHandle);
 
diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp
index aa7ec0e499..e782db75eb 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxwindow.cpp
@@ -96,13 +96,14 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW
         if (window->type() != Qt::CoverWindow) {
             if (needRootWindow)
                 platformScreen->setRootWindow(this);
-            createWindowGroup();
         }
     } else {
         result = screen_create_window_type(&m_window, m_screenContext, SCREEN_CHILD_WINDOW);
     }
     if (result != 0)
         qFatal("QQnxWindow: failed to create window, errno=%d", errno);
+
+    createWindowGroup();
 }
 
 QQnxWindow::~QQnxWindow()
@@ -183,6 +184,12 @@ void QQnxWindow::setVisible(bool visible)
     if (m_visible == visible)
         return;
 
+    // The first time through we join a window group if appropriate.
+    if (m_parentGroupName.isNull() && !m_isTopLevel) {
+        joinWindowGroup(parent() ? static_cast<QQnxWindow*>(parent())->groupName()
+                                 : QByteArray(m_screen->windowGroupName()));
+    }
+
     m_visible = visible;
 
     QQnxWindow *root = this;
@@ -355,16 +362,6 @@ void QQnxWindow::setScreen(QQnxScreen *platformScreen)
             qFatal("QQnxWindow: failed to set window display, errno=%d", errno);
     } else {
         errno = 0;
-        int result;
-        if (!parent()) {
-            result = screen_join_window_group(m_window, platformScreen->windowGroupName());
-            if (result != 0)
-                qFatal("QQnxWindow: failed to join window group, errno=%d", errno);
-        } else {
-            result = screen_join_window_group(m_window, static_cast<QQnxWindow*>(parent())->groupName().constData());
-            if (result != 0)
-                qFatal("QQnxWindow: failed to join window group, errno=%d", errno);
-        }
 
         Q_FOREACH (QQnxWindow *childWindow, m_childWindows) {
             // Only subwindows and tooltips need necessarily be moved to another display with the window.
@@ -408,8 +405,10 @@ void QQnxWindow::setParent(const QPlatformWindow *window)
             setScreen(m_parentWindow->m_screen);
 
         m_parentWindow->m_childWindows.push_back(this);
+        joinWindowGroup(m_parentWindow->groupName());
     } else {
         m_screen->addWindow(this);
+        joinWindowGroup(QByteArray());
     }
 
     adjustBufferSize();
@@ -599,6 +598,34 @@ void QQnxWindow::createWindowGroup()
         qFatal("QQnxRootWindow: failed to create app window group, errno=%d", errno);
 }
 
+void QQnxWindow::joinWindowGroup(const QByteArray &groupName)
+{
+    bool changed = false;
+
+    qWindowDebug() << Q_FUNC_INFO << "group:" << groupName;
+
+    if (!groupName.isEmpty()) {
+        if (groupName != m_parentGroupName) {
+            screen_join_window_group(m_window, groupName);
+            m_parentGroupName = groupName;
+            changed = true;
+        }
+    } else {
+        if (!m_parentGroupName.isEmpty()) {
+            screen_leave_window_group(m_window);
+            changed = true;
+        }
+        // By setting to an empty string we'll stop setVisible from trying to
+        // change our group, we want that to happen only if joinWindowGroup has
+        // never been called.  This allows windows to be created that are not initially
+        // part of any group.
+        m_parentGroupName = "";
+    }
+
+    if (changed)
+        screen_flush_context(m_screenContext, 0);
+}
+
 void QQnxWindow::updateZorder(int &topZorder)
 {
     updateZorder(m_window, topZorder);
diff --git a/src/plugins/platforms/qnx/qqnxwindow.h b/src/plugins/platforms/qnx/qqnxwindow.h
index 2120c07816..5fa7b32dc8 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.h
+++ b/src/plugins/platforms/qnx/qqnxwindow.h
@@ -111,6 +111,7 @@ public:
     void setRotation(int rotation);
 
     QByteArray groupName() const { return m_windowGroupName; }
+    void joinWindowGroup(const QByteArray &groupName);
 
 protected:
     virtual int pixelFormat() const = 0;
@@ -144,7 +145,10 @@ private:
     QString m_mmRendererWindowName;
     screen_window_t m_mmRendererWindow;
 
+    // Group name of window group headed by this window
     QByteArray m_windowGroupName;
+    // Group name that we have joined or "" if we've not joined any group.
+    QByteArray m_parentGroupName;
 
     bool m_isTopLevel;
 };