diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-19 14:26:42 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-19 14:29:27 (GMT) |
commit | d97c42b7fdb4b370ec5a09ef5d6f04e2e22f241d (patch) | |
tree | 02f46498f33b612938155cfb03420f8f1a8f3ba3 /src/corelib/animation/qabstractanimation_p.h | |
parent | d935191592bfe275b6122841de8fa76778be02af (diff) | |
download | Qt-d97c42b7fdb4b370ec5a09ef5d6f04e2e22f241d.zip Qt-d97c42b7fdb4b370ec5a09ef5d6f04e2e22f241d.tar.gz Qt-d97c42b7fdb4b370ec5a09ef5d6f04e2e22f241d.tar.bz2 |
Fixed a crash when declaring an animation with Q_GLOBAL_STATIC
Reviewed-By: gabi
Task-Number: QTBUG-10017
Diffstat (limited to 'src/corelib/animation/qabstractanimation_p.h')
-rw-r--r-- | src/corelib/animation/qabstractanimation_p.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h index 2282cdb..fcfe824 100644 --- a/src/corelib/animation/qabstractanimation_p.h +++ b/src/corelib/animation/qabstractanimation_p.h @@ -124,9 +124,10 @@ private: public: //XXX this is needed by dui static Q_CORE_EXPORT QUnifiedTimer *instance(); + static QUnifiedTimer *instance(bool create); - void registerAnimation(QAbstractAnimation *animation, bool isTopLevel); - void unregisterAnimation(QAbstractAnimation *animation); + static void registerAnimation(QAbstractAnimation *animation, bool isTopLevel); + static void unregisterAnimation(QAbstractAnimation *animation); //defines the timing interval. Default is DEFAULT_TIMER_INTERVAL void setTimingInterval(int interval) @@ -151,13 +152,13 @@ public: 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. */ - void ensureTimerUpdate(); + static void ensureTimerUpdate(); /* this will evaluate the need of restarting the pause timer in case there is still some pause animations running. */ - void restartAnimationTimer(); + static void updateAnimationTimer(); protected: void timerEvent(QTimerEvent *); @@ -187,6 +188,8 @@ private: void registerRunningAnimation(QAbstractAnimation *animation); void unregisterRunningAnimation(QAbstractAnimation *animation); + void restartAnimationTimer(); + void updateAnimationsTime(); int closestPauseAnimationTimeToFinish(); }; |