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

Change-Id: Ica75a71062d0613e415f2433c5c22c2e251b37cd

1 files changed, 5 insertions, 3 deletions

diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 875b68b3ac..063386ed8e 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -705,6 +705,7 @@ void QQuickWidgetPrivate::handleContextCreationFailure(const QSurfaceFormat &for
 
 void QQuickWidgetPrivate::createContext()
 {
+    Q_Q(QQuickWidget);
     // On hide-show we invalidate() but our context is kept.
     // We nonetheless need to initialize() again.
     const bool reinit = context && !offscreenWindow->openglContext();
@@ -716,10 +717,11 @@ void QQuickWidgetPrivate::createContext()
         context = new QOpenGLContext;
         context->setFormat(offscreenWindow->requestedFormat());
 
-        if (qt_gl_global_share_context()) {
+        if (qt_gl_global_share_context())
             context->setShareContext(qt_gl_global_share_context());
-            context->setScreen(context->shareContext()->screen());
-        }
+        else
+            context->setShareContext(QWidgetPrivate::get(q->window())->shareContext());
+        context->setScreen(context->shareContext()->screen());
 
         if (!context->create()) {
             const bool isEs = context->isOpenGLES();