diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-06 10:14:11 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-06 10:14:11 (GMT) |
| commit | 692f6a81e32edb465a8031b868fa34138a5e6982 (patch) | |
| tree | 8989ab24cc03262a604d4914e76d7607792fe94b | |
| parent | cc98c1d3c6fb39bad2ff7f6ebff881a697565305 (diff) | |
| parent | 9845e93e4f36a2ed6fbb282d00dafe9d7a852a23 (diff) | |
| download | Qt-692f6a81e32edb465a8031b868fa34138a5e6982.zip Qt-692f6a81e32edb465a8031b868fa34138a5e6982.tar.gz Qt-692f6a81e32edb465a8031b868fa34138a5e6982.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 93ac840..be99b3b 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -191,9 +191,9 @@ void QUnifiedTimer::ensureTimerUpdate() void QUnifiedTimer::updateAnimationsTime() { // ignore consistentTiming in case the pause timer is active - const int delta = (consistentTiming && !isPauseTimerActive) ? + int delta = (consistentTiming && !isPauseTimerActive) ? timingInterval : time.elapsed() - lastTick; - if slowMode) + if (slowMode) delta /= 5; lastTick = time.elapsed(); |