diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-02 09:58:13 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-02 10:32:33 +0200 |
| commit | 41e924eb6e1c690bc81d095fc5e8f57244aae964 (patch) | |
| tree | b459dfa150530443901be68471df88c69ca7a7d4 /src/quick/scenegraph | |
| parent | d51afdb74fdcb9a5c7e1fdaa763325c78d794d06 (diff) | |
| parent | 87a5889029aed8c53a4b02a42804d036614db36b (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
examples/quick/scenegraph/openglunderqml/squircle.h
src/quick/doc/src/qmltypereference.qdoc
src/quick/scenegraph/qsgthreadedrenderloop.cpp
Change-Id: Ife4f4b897044a7ffcd0710493c6aed1d87cf1ef9
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index 106819e86e..ab94e61976 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"; |