Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/windows/qwindowscontext.cpp
	src/plugins/platforms/windows/windows.pri
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/doc/src/widgets-and-layouts/gallery.qdoc

Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f

2 files changed, 5 insertions, 3 deletions

diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index c66a6d5673..868ac17b6f 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -1907,7 +1907,7 @@ void QFormLayout::getItemPosition(int index, int *rowPtr, ItemRole *rolePtr) con
 
     if (rowPtr)
         *rowPtr = row;
-    if (rolePtr && col != -1) {
+    if (rolePtr && row != -1) {
         const bool spanning = col == 1 && d->m_matrix(row, col)->fullRow;
         if (spanning) {
             *rolePtr = SpanningRole;
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 370ae2aed1..b465ac36c7 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -5611,13 +5611,15 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
                 // punch a hole in the backingstore, so the texture will be visible.
                 if (!q->testAttribute(Qt::WA_AlwaysStackOnTop)) {
                     beginBackingStorePainting();
-                    QPainter p(q);
                     if (backingStore) {
+                        QPainter p(q);
                         p.setCompositionMode(QPainter::CompositionMode_Source);
                         p.fillRect(q->rect(), Qt::transparent);
                     } else {
+                        QImage img = grabFramebuffer();
+                        QPainter p(q);
                         // We are not drawing to a backingstore: fall back to QImage
-                        p.drawImage(q->rect(), grabFramebuffer());
+                        p.drawImage(q->rect(), img);
                         skipPaintEvent = true;
                     }
                     endBackingStorePainting();