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, 8 insertions, 1 deletions

diff --git a/src/plugins/platforms/qnx/qqnxrasterwindow.cpp b/src/plugins/platforms/qnx/qqnxrasterwindow.cpp
index 0fe80d856d..3ac3d23c88 100644
--- a/src/plugins/platforms/qnx/qqnxrasterwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxrasterwindow.cpp
@@ -178,7 +178,7 @@ void QQnxRasterWindow::adjustBufferSize()
 {
     // When having a raster window we don't need any buffers, since
     // Qt will draw to the parent TLW backing store.
-    const QSize windowSize = window()->parent() ? QSize(1,1) : window()->size();
+    const QSize windowSize = window()->parent() ? QSize(0,0) : window()->size();
     if (windowSize != bufferSize())
         setBufferSize(windowSize);
 }
@@ -194,6 +194,13 @@ void QQnxRasterWindow::resetBuffers()
     m_currentBufferIndex = -1;
     m_previousDirty = QRegion();
     m_scrolled = QRegion();
+    if (window()->parent() && bufferSize() == QSize(1,1)) {
+        // If we have a parent then we're not really rendering.  But if we don't render we'll
+        // be invisible and any children won't show up.  This should be harmless since we're
+        // rendering into a 1x1 window that has transparency set to discard.
+        renderBuffer();
+        post(QRegion(0,0,1,1));
+    }
 }
 
 void QQnxRasterWindow::blitPreviousToCurrent(const QRegion &region, int dx, int dy, bool flush)