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/qquickanimatorjob_p.h | |
| 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/qquickanimatorjob_p.h')
| -rw-r--r-- | src/quick/util/qquickanimatorjob_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h index 7c6ad823b3..f91410950c 100644 --- a/src/quick/util/qquickanimatorjob_p.h +++ b/src/quick/util/qquickanimatorjob_p.h @@ -69,6 +69,7 @@ public: void startedByController(); void controllerWasDeleted(); + void markJobManagedByController() { m_jobManagedByController = true; } protected: bool event(QEvent *); @@ -87,7 +88,7 @@ private: void setWindow(QQuickWindow *window); static QObject *findAnimationContext(QQuickAbstractAnimation *); - QQuickAnimatorController *m_controller; + QPointer<QQuickAnimatorController> m_controller; QQuickAbstractAnimation *m_animation; QAbstractAnimationJob *m_job; int m_duration; @@ -100,6 +101,7 @@ private: }; InternalState m_internalState; + bool m_jobManagedByController; }; class Q_QUICK_PRIVATE_EXPORT QQuickAnimatorJob : public QAbstractAnimationJob |