Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev

4 files changed, 8 insertions, 5 deletions

diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index 3f9de28c9d..6887fefd98 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,13 +321,13 @@ set of Particle System types for Qt Quick 2
 */
 
 /*!
-\qmlmodule QtQuick 2.2
+\qmlmodule QtQuick 2.3
 \title Qt Quick QML Types
 \brief This module 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/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h
index 07c434f452..33a642eb69 100644
--- a/src/quick/items/qquickflickable_p_p.h
+++ b/src/quick/items/qquickflickable_p_p.h
@@ -101,7 +101,7 @@ public:
         AxisData(QQuickFlickablePrivate *fp, void (QQuickFlickablePrivate::*func)(qreal))
             : move(fp, func)
             , transitionToBounds(0)
-            , viewSize(-1), lastPos(0), startMargin(0), endMargin(0)
+            , viewSize(-1), lastPos(0), velocity(0), startMargin(0), endMargin(0)
             , origin(0)
             , transitionTo(0)
             , continuousFlickVelocity(0), velocityTime(), vTime(0)
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 3b20241e08..e7c13d15e4 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1094,6 +1094,7 @@ QQuickWindow::~QQuickWindow()
         d->windowManager->windowDestroyed(this);
     }
 
+    QCoreApplication::removePostedEvents(this, QEvent::DeferredDelete);
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
     delete d->incubationController; d->incubationController = 0;
 #ifndef QT_NO_DRAGANDDROP
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index 584098cc89..a74a51146e 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -1218,9 +1218,11 @@ QImage QSGThreadedRenderLoop::grab(QQuickWindow *window)
 
     QImage result;
     w->thread->mutex.lock();
+    m_lockedForSync = true;
     qCDebug(QSG_LOG_RENDERLOOP) << "- posting grab event";
     w->thread->postEvent(new WMGrabEvent(window, &result));
     w->thread->waitCondition.wait(&w->thread->mutex);
+    m_lockedForSync = false;
     w->thread->mutex.unlock();
 
     qCDebug(QSG_LOG_RENDERLOOP) << "- grab complete";