diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-24 00:15:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-24 00:15:00 (GMT) |
| commit | 07c367c2de9fb721cd4e0379acb705ebf1da997f (patch) | |
| tree | 0d52006c40bc0209460341d29455a33713b04bba | |
| parent | 5b412122e6ad517b8d0d7a2f6de989541aa5df7b (diff) | |
| parent | 6567653a003191508ee5561dcd9896cb97cf3ec3 (diff) | |
| download | Qt-07c367c2de9fb721cd4e0379acb705ebf1da997f.zip Qt-07c367c2de9fb721cd4e0379acb705ebf1da997f.tar.gz Qt-07c367c2de9fb721cd4e0379acb705ebf1da997f.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Remove compile warning
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 55e511d..0a1f5d7 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -167,7 +167,7 @@ Q_GLOBAL_STATIC(QThreadStorage<QUnifiedTimer *>, unifiedTimer) QUnifiedTimer::QUnifiedTimer() : QObject(), defaultDriver(this), lastTick(0), timingInterval(DEFAULT_TIMER_INTERVAL), - insideTick(false), currentAnimationIdx(0), consistentTiming(false), slowMode(false), + currentAnimationIdx(0), insideTick(false), consistentTiming(false), slowMode(false), slowdownFactor(5.0f), isPauseTimerActive(false), runningLeafAnimations(0) { time.invalidate(); |