diff options
| author | Sami Lempinen <sami.lempinen@nokia.com> | 2011-05-09 12:18:02 (GMT) |
|---|---|---|
| committer | Sami Lempinen <sami.lempinen@nokia.com> | 2011-05-09 12:18:02 (GMT) |
| commit | fa53804c12e692d29421e22e2c59f6aff2d519e7 (patch) | |
| tree | 00c6f99ab439e4f75fb52ae48ad8589120965813 /src/corelib/animation/qabstractanimation.cpp | |
| parent | 97e423b50d316c3a9e2083c3a9d80bf16554faa9 (diff) | |
| parent | f57395a27730cbf464b7f9293bcf058a0a481a98 (diff) | |
| download | Qt-fa53804c12e692d29421e22e2c59f6aff2d519e7.zip Qt-fa53804c12e692d29421e22e2c59f6aff2d519e7.tar.gz Qt-fa53804c12e692d29421e22e2c59f6aff2d519e7.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/corelib/animation/qabstractanimation.cpp')
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 602cf8a..0a1f5d7 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -260,7 +260,8 @@ void QUnifiedTimer::restartAnimationTimer() } else if (!driver->isRunning() || isPauseTimerActive) { driver->start(); isPauseTimerActive = false; - } + } else if (runningLeafAnimations == 0) + driver->stop(); } void QUnifiedTimer::setTimingInterval(int interval) |