1 files changed, 16 insertions, 7 deletions

diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp
index 4a547aa158..5d9eaaa3ea 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxwindow.cpp
@@ -174,7 +174,9 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW
 
     // If a qnxInitialWindowGroup property is set on the window we'll take this as an
     // indication that we want to create a child window and join that window group.
-    const QVariant windowGroup = window->property("qnxInitialWindowGroup");
+    QVariant windowGroup = window->property("qnxInitialWindowGroup");
+    if (!windowGroup.isValid())
+        windowGroup = window->property("_q_platform_qnxParentGroup");
 
     if (window->type() == Qt::CoverWindow) {
         // Cover windows have to be top level to be accessible to window delegate (i.e. navigator)
@@ -194,7 +196,12 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW
     if (window->type() == Qt::Desktop)  // A desktop widget does not need a libscreen window
         return;
 
-    if (m_isTopLevel) {
+    QVariant type = window->property("_q_platform_qnxWindowType");
+    if (type.isValid() && type.canConvert<int>()) {
+        Q_SCREEN_CHECKERROR(
+                screen_create_window_type(&m_window, m_screenContext, type.value<int>()),
+                "Could not create window");
+    } else if (m_isTopLevel) {
         Q_SCREEN_CRITICALERROR(screen_create_window(&m_window, m_screenContext),
                             "Could not create top level window"); // Creates an application window
         if (window->type() != Qt::CoverWindow) {
@@ -212,7 +219,9 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW
     // If the window has a qnxWindowId property, set this as the string id property. This generally
     // needs to be done prior to joining any group as it might be used by the owner of the
     // group to identify the window.
-    const QVariant windowId = window->property("qnxWindowId");
+    QVariant windowId = window->property("qnxWindowId");
+    if (!windowId.isValid())
+        windowId = window->property("_q_platform_qnxWindowId");
     if (windowId.isValid() && windowId.canConvert<QByteArray>()) {
         QByteArray id = windowId.toByteArray();
         Q_SCREEN_CHECKERROR(screen_set_window_property_cv(m_window, SCREEN_PROPERTY_ID_STRING,
@@ -262,7 +271,7 @@ QQnxWindow::~QQnxWindow()
     Q_ASSERT(m_childWindows.size() == 0);
 
     // Remove from plugin's window mapper
-    QQnxIntegration::removeWindow(m_window);
+    QQnxIntegration::instance()->removeWindow(m_window);
 
     // Remove from parent's Hierarchy.
     removeFromParent();
@@ -471,7 +480,7 @@ void QQnxWindow::setScreen(QQnxScreen *platformScreen)
         qWindowDebug("Moving window to different screen");
         m_screen->removeWindow(this);
 
-        if ((QQnxIntegration::options() & QQnxIntegration::RootWindow)) {
+        if ((QQnxIntegration::instance()->options() & QQnxIntegration::RootWindow)) {
             screen_leave_window_group(m_window);
         }
     }
@@ -726,7 +735,7 @@ void QQnxWindow::initWindow()
         m_exposed = false;
 
     // Add window to plugin's window mapper
-    QQnxIntegration::addWindow(m_window, window());
+    QQnxIntegration::instance()->addWindow(m_window, window());
 
     // Qt never calls these setters after creating the window, so we need to do that ourselves here
     setWindowState(window()->windowState());
@@ -823,7 +832,7 @@ void QQnxWindow::windowPosted()
 bool QQnxWindow::shouldMakeFullScreen() const
 {
     return ((static_cast<QQnxScreen *>(screen())->rootWindow() == this)
-            && (QQnxIntegration::options() & QQnxIntegration::FullScreenApplication));
+            && (QQnxIntegration::instance()->options() & QQnxIntegration::FullScreenApplication));
 }
 
 QT_END_NAMESPACE