Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: Iafccb173a9b5569bc9fd1022abb210955519fc61

3 files changed, 7 insertions, 5 deletions

diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc
index 61d4e67acb..0f98773b70 100644
--- a/src/qml/doc/src/qmltypereference.qdoc
+++ b/src/qml/doc/src/qmltypereference.qdoc
@@ -55,7 +55,7 @@ are also provided by the \c QtQuick namespace which may be imported as
 follows:
 
 \qml
-import QtQuick 2.2
+import QtQuick 2.3
 \endqml
 
 See the \l{Qt Quick} module documentation for more information about the \c
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index 7fc9bea032..f048186d58 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -42,11 +42,11 @@ by this module, organized according to category and purpose.
 The types provided by the \l {Qt Quick} module are only available in a QML document
 if that document imports the \c QtQuick namespace.
 
-The current version of the \c QtQuick module is version 2.2, and thus it may be
+The current version of the \c QtQuick module is version 2.3, and thus it may be
 imported via the following statement:
 
 \qml
-import QtQuick 2.2
+import QtQuick 2.3
 \endqml
 
 See the \l {Qt Quick} module documentation for more
@@ -321,12 +321,12 @@ set of Particle System types for Qt Quick 2
 */
 
 /*!
-\qmlmodule QtQuick 2.2
+\qmlmodule QtQuick 2.3
 \brief The Provides graphical primitives for use in QML.
 
 The \l{Qt Quick} module provides graphical primitive types. They can be used with the following import
 \code
-import QtQuick 2.2
+import QtQuick 2.3
 \endcode
 
 For a more detailed listing of types in the \c {QtQuick} import, see the \l{Qt Quick QML Types} page.
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index ae8d135d83..296050ec2f 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -1277,10 +1277,12 @@ QImage QSGThreadedRenderLoop::grab(QQuickWindow *window)
 
     QImage result;
     w->thread->mutex.lock();
+    m_locked = true;
     QSG_GUI_DEBUG(w->window, " - locking, posting grab event");
     w->thread->postEvent(new WMGrabEvent(window, &result));
     w->thread->waitCondition.wait(&w->thread->mutex);
     QSG_GUI_DEBUG(w->window, " - locking, grab done, unlocking");
+    m_locked = false;
     w->thread->mutex.unlock();
 
     QSG_GUI_DEBUG(w->window, " - grab complete");