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

Conflicts:
	.qmake.conf
	src/qml/qml/qqmlengine.cpp
	src/quick/items/qquickitemsmodule.cpp
	tools/qml/main.cpp

Change-Id: Ida8daf6b4d7e675385f2f5514c446e52dedaf136

1 files changed, 8 insertions, 1 deletions

diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 1afea402fd..955abfddb2 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -202,7 +202,12 @@ void QQuickWidgetPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRec
 
 void QQuickWidgetPrivate::render(bool needsSync)
 {
-    context->makeCurrent(offscreenSurface);
+    if (!context->makeCurrent(offscreenSurface)) {
+        qWarning("QQuickWidget: Cannot render due to failing makeCurrent()");
+        return;
+    }
+
+    QOpenGLContextPrivate::get(context)->defaultFboRedirect = fbo->handle();
 
     if (needsSync) {
         renderControl->polishItems();
@@ -217,6 +222,8 @@ void QQuickWidgetPrivate::render(bool needsSync)
     }
 
     static_cast<QOpenGLExtensions *>(context->functions())->flushShared();
+
+    QOpenGLContextPrivate::get(context)->defaultFboRedirect = 0;
 }
 
 void QQuickWidgetPrivate::renderSceneGraph()