diff options
| author | Andreas Kling <andreas.kling@nokia.com> | 2010-02-02 11:46:53 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2010-02-02 11:46:53 (GMT) |
| commit | 56b910a838e93d849ec260f4c3db9a716beecdc0 (patch) | |
| tree | 50b9cb09e3ea7780e144bb02f42475dcf740f297 /src/corelib/animation/qabstractanimation.cpp | |
| parent | 84f826b764acecc0a93fcfd643719f6447b5d47c (diff) | |
| parent | 7ced77b654eb46af1221a55e315795c1be1753a0 (diff) | |
| download | Qt-56b910a838e93d849ec260f4c3db9a716beecdc0.zip Qt-56b910a838e93d849ec260f4c3db9a716beecdc0.tar.gz Qt-56b910a838e93d849ec260f4c3db9a716beecdc0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/corelib/animation/qabstractanimation.cpp')
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 2b4ab47..cedb43f 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -299,8 +299,6 @@ void QUnifiedTimer::registerRunningAnimation(QAbstractAnimation *animation) return; if (QAbstractAnimationPrivate::get(animation)->isPause) { - if (animation->duration() == -1) - qDebug() << "toto"; runningPauseAnimations << animation; } else runningLeafAnimations++; |