diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-09-24 12:51:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 20:08:19 +0200 |
| commit | 0150202cc710e580695656fee049bf25091c0ded (patch) | |
| tree | 217f5fbf792b5d40baeea0916064bb0ac2050b84 /src/quick/util/qquickanimatorcontroller_p.h | |
| parent | c40d9f64a6bd9671edc807bc74cf5b73c7465250 (diff) | |
Allow animators to work properly with multiple windows
Change-Id: I5ba663ba0fa089ea786cf43cb4dfa40cbc955342
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'src/quick/util/qquickanimatorcontroller_p.h')
| -rw-r--r-- | src/quick/util/qquickanimatorcontroller_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/util/qquickanimatorcontroller_p.h b/src/quick/util/qquickanimatorcontroller_p.h index 1c79e3c493..ab08bf05db 100644 --- a/src/quick/util/qquickanimatorcontroller_p.h +++ b/src/quick/util/qquickanimatorcontroller_p.h @@ -93,7 +93,7 @@ public: public Q_SLOTS: void animationsStarted(); - void animationsStopped(); + void itemDestroyed(QObject *); public: QList<QAbstractAnimationJob *> starting; @@ -104,9 +104,9 @@ public: QHash<QQuickItem *, QQuickTransformAnimatorJob::Helper *> transforms; - QQuickWindow *window; + QSet<QQuickItem *> deletedSinceLastFrame; - QAnimationDriver *driver; + QQuickWindow *window; QMutex mutex; }; |