diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-09-08 13:10:21 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-09-08 13:10:21 +0200 |
| commit | 38fe461e2cc4bf3aebcb98d25c643bfe6653120a (patch) | |
| tree | b625415f33791ce0202538396509379fd04b111a /src/quick/util/qquickanimatorcontroller.cpp | |
| parent | f9ee33f9683a4cd4d1a2e41efa6e8d124e9d731d (diff) | |
| parent | f7c3035fa1d965dceb36892122683a5ceb6cab89 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
src/qml/jsruntime/qv4arraydata.cpp
src/quick/scenegraph/util/qsgatlastexture.cpp
Change-Id: Ic4c96066d5c37dcf0d5446baed590ea005d445ce
Diffstat (limited to 'src/quick/util/qquickanimatorcontroller.cpp')
| -rw-r--r-- | src/quick/util/qquickanimatorcontroller.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/util/qquickanimatorcontroller.cpp b/src/quick/util/qquickanimatorcontroller.cpp index 01f182c35d..42b8840bf4 100644 --- a/src/quick/util/qquickanimatorcontroller.cpp +++ b/src/quick/util/qquickanimatorcontroller.cpp @@ -254,6 +254,7 @@ void QQuickAnimatorController::requestSync() // These functions are called on the GUI thread. void QQuickAnimatorController::startJob(QQuickAnimatorProxyJob *proxy, QAbstractAnimationJob *job) { + proxy->markJobManagedByController(); m_starting[job] = proxy; requestSync(); } |