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/qquickanimatorjob_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/qquickanimatorjob_p.h')
| -rw-r--r-- | src/quick/util/qquickanimatorjob_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h index c6814523c6..44155c1f93 100644 --- a/src/quick/util/qquickanimatorjob_p.h +++ b/src/quick/util/qquickanimatorjob_p.h @@ -126,6 +126,7 @@ public: QEasingCurve easingCurve() const { return m_easing; } void setEasingCurve(const QEasingCurve &curve) { m_easing = curve; } + void targetWasDeleted(); virtual void initialize(QQuickAnimatorController *controller); virtual void writeBack() = 0; @@ -140,7 +141,7 @@ protected: QQuickAnimatorJob(); void updateState(State newState, State oldState); - QPointer<QQuickItem> m_target; + QQuickItem *m_target; QQuickAnimatorController *m_controller; qreal m_from; @@ -164,7 +165,6 @@ public: { Helper() : ref(1) - , item(0) , node(0) , ox(0) , oy(0) @@ -177,6 +177,8 @@ public: { } + ~Helper(); + void sync(); void apply(); |