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

Conflicts:
	.qmake.conf
	src/quick/doc/src/qmltypereference.qdoc

Change-Id: Ia58f1c5a98309c32ef8d8e5c893faf261215f19f

2 files changed, 4 insertions, 3 deletions

diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index f2828bbedd..7e995936af 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -284,6 +284,7 @@ bool QQuickRenderControl::sync()
 
     QQuickWindowPrivate *cd = QQuickWindowPrivate::get(d->window);
     cd->syncSceneGraph();
+    d->rc->endSync();
 
     // TODO: find out if the sync actually caused a scenegraph update.
     return true;
@@ -383,6 +384,7 @@ QImage QQuickRenderControl::grab()
         QQuickWindowPrivate *cd = QQuickWindowPrivate::get(d->window);
         cd->polishItems();
         cd->syncSceneGraph();
+        d->rc->endSync();
         render();
         grabContent = qt_gl_read_framebuffer(d->window->size() * d->window->effectiveDevicePixelRatio(), false, false);
         if (QQuickRenderControl::renderWindowFor(d->window)) {
@@ -402,6 +404,7 @@ QImage QQuickRenderControl::grab()
             softwareRenderer->markDirty();
             cd->polishItems();
             cd->syncSceneGraph();
+            d->rc->endSync();
             render();
             softwareRenderer->setCurrentPaintDevice(prevDev);
         }
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 2cb518d691..7ea593fe76 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -432,10 +432,8 @@ void QQuickWindowPrivate::syncSceneGraph()
 
     emit q->afterSynchronizing();
     runAndClearJobs(&afterSynchronizingJobs);
-    context->endSync();
 }
 
-
 void QQuickWindowPrivate::renderSceneGraph(const QSize &size)
 {
     QML_MEMORY_SCOPE_STRING("SceneGraph");
@@ -3434,7 +3432,7 @@ void QQuickWindow::setRenderTarget(QOpenGLFramebufferObject *fbo)
 {
     Q_D(QQuickWindow);
     if (d->context && QThread::currentThread() != d->context->thread()) {
-        qWarning("QQuickWindow::setRenderThread: Cannot set render target from outside the rendering thread");
+        qWarning("QQuickWindow::setRenderTarget: Cannot set render target from outside the rendering thread");
         return;
     }