1 files changed, 25 insertions, 8 deletions

diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp
index 855da13681..69e672aefc 100644
--- a/src/plugins/platforms/qnx/qqnxscreen.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreen.cpp
@@ -85,7 +85,9 @@ static QSize determineScreenSize(screen_display_t display, bool primaryScreen) {
     if (val[0] > 0 && val[1] > 0)
         return QSize(val[0], val[1]);
 
-    qWarning("QQnxScreen: screen_get_display_property_iv() reported an invalid physical screen size (%dx%d). Falling back to QQNX_PHYSICAL_SCREEN_SIZE environment variable.", val[0], val[1]);
+    qScreenDebug("QQnxScreen: screen_get_display_property_iv() reported an invalid "
+                 "physical screen size (%dx%d). Falling back to QQNX_PHYSICAL_SCREEN_SIZE "
+                 "environment variable.", val[0], val[1]);
 
     const QString envPhySizeStr = qgetenv("QQNX_PHYSICAL_SCREEN_SIZE");
     if (!envPhySizeStr.isEmpty()) {
@@ -94,7 +96,9 @@ static QSize determineScreenSize(screen_display_t display, bool primaryScreen) {
         const int envHeight = envPhySizeStrList.size() == 2 ? envPhySizeStrList[1].toInt() : -1;
 
         if (envWidth <= 0 || envHeight <= 0) {
-            qFatal("QQnxScreen: The value of QQNX_PHYSICAL_SCREEN_SIZE must be in the format \"width,height\" in mm, with width, height > 0. Example: QQNX_PHYSICAL_SCREEN_SIZE=150,90");
+            qFatal("QQnxScreen: The value of QQNX_PHYSICAL_SCREEN_SIZE must be in the format "
+                   "\"width,height\" in mm, with width, height > 0. "
+                   "Example: QQNX_PHYSICAL_SCREEN_SIZE=150,90");
             return QSize(150, 90);
         }
 
@@ -103,11 +107,14 @@ static QSize determineScreenSize(screen_display_t display, bool primaryScreen) {
 
 #if defined(QQNX_PHYSICAL_SCREEN_SIZE_DEFINED)
     const QSize defSize(QQNX_PHYSICAL_SCREEN_WIDTH, QQNX_PHYSICAL_SCREEN_HEIGHT);
-    qWarning("QQnxScreen: QQNX_PHYSICAL_SCREEN_SIZE variable not set. Falling back to defines QQNX_PHYSICAL_SCREEN_WIDTH/QQNX_PHYSICAL_SCREEN_HEIGHT (%dx%d)", defSize.width(), defSize.height());
+    qWarning("QQnxScreen: QQNX_PHYSICAL_SCREEN_SIZE variable not set. Falling back to defines "
+             "QQNX_PHYSICAL_SCREEN_WIDTH/QQNX_PHYSICAL_SCREEN_HEIGHT (%dx%d)",
+             defSize.width(), defSize.height());
     return defSize;
 #else
     if (primaryScreen)
-        qFatal("QQnxScreen: QQNX_PHYSICAL_SCREEN_SIZE variable not set. Could not determine physical screen size.");
+        qFatal("QQnxScreen: QQNX_PHYSICAL_SCREEN_SIZE variable not set. "
+               "Could not determine physical screen size.");
     return QSize(150, 90);
 #endif
 }
@@ -119,7 +126,6 @@ QQnxScreen::QQnxScreen(screen_context_t screenContext, screen_display_t display,
       m_posted(false),
       m_keyboardHeight(0),
       m_nativeOrientation(Qt::PrimaryOrientation),
-      m_platformContext(0),
       m_cursor(new QQnxCursor())
 {
     qScreenDebug() << Q_FUNC_INFO;
@@ -475,9 +481,14 @@ void QQnxScreen::updateHierarchy()
     int topZorder;
 
     errno = 0;
-    result = screen_get_window_property_iv(rootWindow()->nativeHandle(), SCREEN_PROPERTY_ZORDER, &topZorder);
-    if (result != 0)
-        qFatal("QQnxScreen: failed to query root window z-order, errno=%d", errno);
+    if (isPrimaryScreen()) {
+        result = screen_get_window_property_iv(rootWindow()->nativeHandle(), SCREEN_PROPERTY_ZORDER, &topZorder);
+        if (result != 0)
+            qFatal("QQnxScreen: failed to query root window z-order, errno=%d", errno);
+    } else {
+        topZorder = 0;  //We do not need z ordering on the secondary screen, because only one window
+                        //is supported there
+    }
 
     topZorder++; // root window has the lowest z-order in the windowgroup
 
@@ -638,6 +649,9 @@ void QQnxScreen::activateWindowGroup(const QByteArray &id)
     if (!window)
         return;
 
+    Q_FOREACH (QQnxWindow *childWindow, m_childWindows)
+        childWindow->setExposed(true);
+
     QWindowSystemInterface::handleWindowActivated(window);
 }
 
@@ -648,6 +662,9 @@ void QQnxScreen::deactivateWindowGroup(const QByteArray &id)
     if (!rootWindow() || id != rootWindow()->groupName())
         return;
 
+    Q_FOREACH (QQnxWindow *childWindow, m_childWindows)
+        childWindow->setExposed(false);
+
     QWindowSystemInterface::handleWindowActivated(0);
 }