Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	qmake/library/qmakeevaluator.cpp

One side changed the iterator to use ranged-for, the other changed its
body; they only conflicted because the latter had to add braces around
the body, intruding on the for-line.  Trivial resolution.

Change-Id: Ib487bc3bd6e3c5225db15f94b9a8f6caaa33456b

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp
index e04f16db92..f4e6ca9804 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxwindow.cpp
@@ -386,7 +386,12 @@ void QQnxWindow::setBufferSize(const QSize &size)
     // Set the transparency. According to QNX technical support, setting the window
     // transparency property should always be done *after* creating the window
     // buffers in order to guarantee the property is paid attention to.
-    if (window()->requestedFormat().alphaBufferSize() == 0) {
+    if (size.isEmpty()) {
+        // We can't create 0x0 buffers and instead make them 1x1.  But to allow these windows to
+        // still be 'visible' (thus allowing their children to be visible), we need to allow
+        // them to be posted but still not show up.
+        val[0] = SCREEN_TRANSPARENCY_DISCARD;
+    } else if (window()->requestedFormat().alphaBufferSize() == 0) {
         // To avoid overhead in the composition manager, disable blending
         // when the underlying window buffer doesn't have an alpha channel.
         val[0] = SCREEN_TRANSPARENCY_NONE;