diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:55:34 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:55:34 (GMT) |
| commit | 168524d4f642724fe9063500c0c39ab747f145b6 (patch) | |
| tree | 9c13991d7e1ee6134fc0d99e1a6369c167100f76 /src/corelib/animation/qparallelanimationgroup.cpp | |
| parent | 764f558846b8ee6f115004fc939b890991c40bfa (diff) | |
| parent | becf7dc2b4b7c2609350eb3236f854c1a4a344f5 (diff) | |
| download | Qt-168524d4f642724fe9063500c0c39ab747f145b6.zip Qt-168524d4f642724fe9063500c0c39ab747f145b6.tar.gz Qt-168524d4f642724fe9063500c0c39ab747f145b6.tar.bz2 | |
Merge branch '4.6' of ..\qt-graphics-4.6
Diffstat (limited to 'src/corelib/animation/qparallelanimationgroup.cpp')
| -rw-r--r-- | src/corelib/animation/qparallelanimationgroup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/animation/qparallelanimationgroup.cpp b/src/corelib/animation/qparallelanimationgroup.cpp index 0a04c14..2d37d10 100644 --- a/src/corelib/animation/qparallelanimationgroup.cpp +++ b/src/corelib/animation/qparallelanimationgroup.cpp @@ -182,11 +182,11 @@ void QParallelAnimationGroup::updateCurrentTime(int currentTime) /*! \reimp */ -void QParallelAnimationGroup::updateState(QAbstractAnimation::State oldState, - QAbstractAnimation::State newState) +void QParallelAnimationGroup::updateState(QAbstractAnimation::State newState, + QAbstractAnimation::State oldState) { Q_D(QParallelAnimationGroup); - QAnimationGroup::updateState(oldState, newState); + QAnimationGroup::updateState(newState, oldState); switch (newState) { case Stopped: |