diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-06-13 23:10:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-06-13 23:10:03 +0200 |
| commit | 9932617582470d717c97f8161a65133293c185c5 (patch) | |
| tree | 1df48d67c6e5ca4aa8b7810fc9e717083b4199e3 /src/quick/scenegraph/qsgthreadedrenderloop.cpp | |
| parent | 7fde8a8d20da7fa00d974286fa903b3fee76d466 (diff) | |
| parent | 17ee404f2678684674b9c5c0c523602953146e37 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/quickwidgets/qquickwidget.cpp
Change-Id: Id4b080aea713df68608847bb82570231e37ce536
Diffstat (limited to 'src/quick/scenegraph/qsgthreadedrenderloop.cpp')
| -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 1ba54ea19e..e4d61eb0ae 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -1199,6 +1199,8 @@ bool QSGThreadedRenderLoop::event(QEvent *e) Window *w = windowForTimer(te->timerId()); if (w) polishAndSync(w); + else + killTimer(te->timerId()); } return true; } |