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

Change-Id: If91e0e28d004f1db978dcab393f189743bb69cd5

1 files changed, 7 insertions, 4 deletions

diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index b6431666bf..26a540455e 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -1176,17 +1176,20 @@ void QQuickWidget::mouseDoubleClickEvent(QMouseEvent *e)
 void QQuickWidget::showEvent(QShowEvent *)
 {
     Q_D(QQuickWidget);
-    d->updatePending = false;
     if (!d->useSoftwareRenderer) {
         d->createContext();
-        if (d->offscreenWindow->openglContext())
+        if (d->offscreenWindow->openglContext()) {
             d->render(true);
-        else
+            if (d->updatePending) {
+                d->updatePending = false;
+                update();
+            }
+        } else {
             triggerUpdate();
+        }
     } else {
         triggerUpdate();
     }
-
     QWindowPrivate *offscreenPrivate = QWindowPrivate::get(d->offscreenWindow);
     if (!offscreenPrivate->visible) {
         offscreenPrivate->visible = true;