diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2016-05-31 12:11:36 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2016-05-31 12:24:30 +0200 |
| commit | 91e1a65cdb5b4fc802c80c75e255a72671d97645 (patch) | |
| tree | e981fac1afb7e38c9f6aba28e2c1b646e461950b /src/quick/scenegraph/qsgthreadedrenderloop.cpp | |
| parent | 5956771cb9fc6468eaf002ebe8a7a3396807c2c1 (diff) | |
| parent | e5c76615b72abcae628ca7561c16eab71f1d3a0e (diff) | |
Merge remote-tracking branch 'origin/dev' into scenegraphng
Change-Id: I35715e07b6f837f21cd8e8898f19d97af92c6b69
Diffstat (limited to 'src/quick/scenegraph/qsgthreadedrenderloop.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index 1feba32ab2..3ff32b360d 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -1142,7 +1142,7 @@ void QSGThreadedRenderLoop::polishAndSync(Window *w, bool inExpose) } // Flush pending touch events. - QQuickWindowPrivate::get(window)->flushDelayedTouchEvent(); + QQuickWindowPrivate::get(window)->flushFrameSynchronousEvents(); // The delivery of the event might have caused the window to stop rendering w = windowFor(m_windows, window); if (!w || !w->thread || !w->thread->window) { |