diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-11-13 13:30:20 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-11-13 14:09:41 +0100 |
| commit | 29521913732704306b7db824ac9ce4be461bffc8 (patch) | |
| tree | d834bd3d78a833bf767c4ba813e2d838d12dd4f2 /src/quick/util | |
| parent | 7853634a1134a2b4b470a6d2c8b5da1610105d51 (diff) | |
| parent | 6990ae6c1bad32952e371fa72bee65a7af11c313 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quick/items/qquickwindow.cpp
src/quick/items/qquickwindow_p.h
tests/auto/quick/quick.pro
Change-Id: Ia12f20e95fb151bbbc75dbf187364a924cd0bc7a
Diffstat (limited to 'src/quick/util')
| -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(); |