diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-01 08:36:03 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-02 11:14:49 (GMT) |
| commit | fffb6f200785a9e85d56431f598046bb6b5d493b (patch) | |
| tree | 535c1aacddca33340f02e72f3dcb30f875e10578 /src/corelib | |
| parent | f707672eb4c51ea82fbd98e1da16ece61a74c690 (diff) | |
| download | Qt-fffb6f200785a9e85d56431f598046bb6b5d493b.zip Qt-fffb6f200785a9e85d56431f598046bb6b5d493b.tar.gz Qt-fffb6f200785a9e85d56431f598046bb6b5d493b.tar.bz2 | |
Fix animation tests after merge
The commit 903fdabf3eb808a96e2a869049c2095cde09d2be was not properly merged
Diffstat (limited to 'src/corelib')
| -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 f20bbf4..602cf8a 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), - currentAnimationIdx(0), consistentTiming(false), slowMode(false), + currentAnimationIdx(0), insideTick(false), consistentTiming(false), slowMode(false), slowdownFactor(5.0f), isPauseTimerActive(false), runningLeafAnimations(0) { time.invalidate(); |