diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 06:32:04 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 06:32:04 (GMT) |
| commit | 8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e (patch) | |
| tree | b8b69f812095df8bf780f88302c7784c4d2e18e0 /src/corelib/animation/qabstractanimation.cpp | |
| parent | 34450eb48e56677395601bf155a6a05752b326ad (diff) | |
| parent | dbfe5f81e300de3a43311197826f23ff031b4b23 (diff) | |
| download | Qt-8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e.zip Qt-8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e.tar.gz Qt-8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e.tar.bz2 | |
Merge remote branch 'origin/master' into bearermanagement/integration
Conflicts:
configure
Diffstat (limited to 'src/corelib/animation/qabstractanimation.cpp')
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index cedb43f..f834a80 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -161,7 +161,9 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_THREAD Q_GLOBAL_STATIC(QThreadStorage<QUnifiedTimer *>, unifiedTimer) +#endif QUnifiedTimer::QUnifiedTimer() : QObject(), lastTick(0), timingInterval(DEFAULT_TIMER_INTERVAL), @@ -173,12 +175,17 @@ QUnifiedTimer::QUnifiedTimer() : QUnifiedTimer *QUnifiedTimer::instance() { QUnifiedTimer *inst; +#ifndef QT_NO_THREAD if (!unifiedTimer()->hasLocalData()) { inst = new QUnifiedTimer; unifiedTimer()->setLocalData(inst); } else { inst = unifiedTimer()->localData(); } +#else + static QUnifiedTimer unifiedTimer; + inst = &unifiedTimer; +#endif return inst; } @@ -242,7 +249,7 @@ void QUnifiedTimer::timerEvent(QTimerEvent *event) animationTimer.stop(); isPauseTimerActive = false; // invalidate the start reference time - time = QTime(); + time.invalidate(); } else { restartAnimationTimer(); if (!time.isValid()) { |