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

Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14

1 files changed, 6 insertions, 1 deletions

diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp
index d3bc6f52e5..2f2db32852 100644
--- a/src/widgets/kernel/qwidgetbackingstore.cpp
+++ b/src/widgets/kernel/qwidgetbackingstore.cpp
@@ -1129,12 +1129,17 @@ void QWidgetBackingStore::doSync()
         // prevent triggering unnecessary backingstore painting when only the
         // OpenGL content changes. Check if we have such widgets in the special
         // dirty list.
+        QVarLengthArray<QWidget *, 16> paintPending;
         for (int i = 0; i < dirtyRenderToTextureWidgets.count(); ++i) {
             QWidget *w = dirtyRenderToTextureWidgets.at(i);
-            w->d_func()->sendPaintEvent(w->rect());
+            paintPending << w;
             resetWidget(w);
         }
         dirtyRenderToTextureWidgets.clear();
+        for (int i = 0; i < paintPending.count(); ++i) {
+            QWidget *w = paintPending[i];
+            w->d_func()->sendPaintEvent(w->rect());
+        }
 
         // We might have newly exposed areas on the screen if this function was
         // called from sync(QWidget *, QRegion)), so we have to make sure those