diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-13 13:49:03 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-13 13:49:03 +0000 |
| commit | 5885841150f36ffb44f592512513cec2fafffb0b (patch) | |
| tree | 77df3a34693877a839ee825be7c59f6eff359116 /src/quick/util/qquickanimatorcontroller.cpp | |
| parent | 447f8e399de2a68bdd92238523201e56d1929a0f (diff) | |
| parent | 29521913732704306b7db824ac9ce4be461bffc8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/quick/util/qquickanimatorcontroller.cpp')
| -rw-r--r-- | src/quick/util/qquickanimatorcontroller.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/util/qquickanimatorcontroller.cpp b/src/quick/util/qquickanimatorcontroller.cpp index 3f7347c01d..5cf8051922 100644 --- a/src/quick/util/qquickanimatorcontroller.cpp +++ b/src/quick/util/qquickanimatorcontroller.cpp @@ -123,8 +123,10 @@ static void qquickanimator_sync_before_start(QAbstractAnimationJob *job) void QQuickAnimatorController::beforeNodeSync() { - for (const QSharedPointer<QAbstractAnimationJob> &toStop : qAsConst(m_rootsPendingStop)) + for (const QSharedPointer<QAbstractAnimationJob> &toStop : qAsConst(m_rootsPendingStop)) { toStop->stop(); + m_animationRoots.remove(toStop.data()); + } m_rootsPendingStop.clear(); |