diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-30 10:42:34 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-02-02 15:59:32 +0100 |
| commit | a9a9fa0c4737017aa4fc72b467eb45645d0912f0 (patch) | |
| tree | 4753218705648384e6555be0e2bf3165bfb391d9 /src/qml/animations/qabstractanimationjob_p.h | |
| parent | eace041161a03a849d3896af65493b7885cecc04 (diff) | |
| parent | e6d4df156e9aec62054740dc99ab8ba2855eaafc (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
src/qml/compiler/qqmlirbuilder.cpp
src/qml/compiler/qqmlirbuilder_p.h
src/qml/compiler/qqmltypecompiler.cpp
src/qml/compiler/qv4codegen.cpp
src/qml/compiler/qv4codegen_p.h
src/qml/compiler/qv4compileddata_p.h
src/qml/compiler/qv4compiler.cpp
src/qml/compiler/qv4compilercontext_p.h
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4jsir.cpp
src/qml/compiler/qv4jsir_p.h
src/qml/jit/qv4isel_masm.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4functionobject.cpp
src/qml/jsruntime/qv4runtimecodegen.cpp
src/qml/jsruntime/qv4script.cpp
src/qml/jsruntime/qv4script_p.h
src/qml/qml/qqmltypeloader.cpp
src/quick/items/qquickanimatedimage.cpp
src/quick/items/qquickanimatedimage_p_p.h
src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp
tests/auto/qml/qmlplugindump/qmlplugindump.pro
tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
tools/qmlcachegen/qmlcachegen.cpp
tools/qmljs/qmljs.cpp
Done-with: Shawn Rutledge <shawn.rutledge@qt.io>
Done-with: Lars Knoll <lars.knoll@qt.io>
Done-with: Ulf Hermann <ulf.hermann@qt.io>
Change-Id: I010e6525440a85f3b9a10bb9083f8e4352751b1d
Diffstat (limited to 'src/qml/animations/qabstractanimationjob_p.h')
| -rw-r--r-- | src/qml/animations/qabstractanimationjob_p.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h index 95a39b1301..63fd4b0dac 100644 --- a/src/qml/animations/qabstractanimationjob_p.h +++ b/src/qml/animations/qabstractanimationjob_p.h @@ -60,6 +60,8 @@ QT_BEGIN_NAMESPACE class QAnimationGroupJob; class QAnimationJobChangeListener; +class QQmlAnimationTimer; + class Q_QML_PRIVATE_EXPORT QAbstractAnimationJob { Q_DISABLE_COPY(QAbstractAnimationJob) @@ -168,6 +170,7 @@ protected: QAbstractAnimationJob *m_nextSibling; QAbstractAnimationJob *m_previousSibling; + QQmlAnimationTimer *m_timer = nullptr; bool *m_wasDeleted; bool m_hasRegisteredTimer:1; @@ -203,20 +206,20 @@ public: static QQmlAnimationTimer *instance(); static QQmlAnimationTimer *instance(bool create); - static void registerAnimation(QAbstractAnimationJob *animation, bool isTopLevel); - static void unregisterAnimation(QAbstractAnimationJob *animation); + void registerAnimation(QAbstractAnimationJob *animation, bool isTopLevel); + void unregisterAnimation(QAbstractAnimationJob *animation); /* this is used for updating the currentTime of all animations in case the pause timer is active or, otherwise, only of the animation passed as parameter. */ - static void ensureTimerUpdate(); + void ensureTimerUpdate(); /* this will evaluate the need of restarting the pause timer in case there is still some pause animations running. */ - static void updateAnimationTimer(); + void updateAnimationTimer(); void restartAnimationTimer() override; void updateAnimationsTime(qint64 timeStep) override; |