diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-19 13:05:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-19 13:05:12 +0200 |
| commit | a2d36c9ef566a3e0ec42e297a3d314f134c87da1 (patch) | |
| tree | 3cf02240bc190e0ae52c5cb1163e523635e443ab /src/qml/animations/qabstractanimationjob_p.h | |
| parent | 15b90204fa5126f339db551cf7429534f1359322 (diff) | |
| parent | e9520ec84c95e10a6826b2289e46552a2d446895 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/imports/sharedimage/qsharedimageloader.cpp
src/quick/items/qquickitemviewfxitem_p_p.h
Change-Id: I12ce7c32788f4a394188a934e689b4ebac78138b
Diffstat (limited to 'src/qml/animations/qabstractanimationjob_p.h')
| -rw-r--r-- | src/qml/animations/qabstractanimationjob_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h index 0be6ca96ea..d046ce9def 100644 --- a/src/qml/animations/qabstractanimationjob_p.h +++ b/src/qml/animations/qabstractanimationjob_p.h @@ -52,6 +52,7 @@ // #include <private/qtqmlglobal_p.h> +#include <private/qanimationjobutil_p.h> #include <QtCore/QObject> #include <QtCore/private/qabstractanimation_p.h> #include <vector> @@ -130,6 +131,7 @@ public: bool isRenderThreadJob() const { return m_isRenderThreadJob; } bool isRenderThreadProxy() const { return m_isRenderThreadProxy; } + SelfDeletable m_selfDeletable; protected: virtual void updateCurrentTime(int) {} virtual void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState); @@ -174,7 +176,6 @@ protected: QAbstractAnimationJob *m_previousSibling; QQmlAnimationTimer *m_timer = nullptr; - bool *m_wasDeleted; bool m_hasRegisteredTimer:1; bool m_isPause:1; bool m_isGroup:1; |