diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 11:46:57 +0100 |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 11:46:57 +0100 |
commit | 683cca297d29e7ea9f84c087a3c081dcccea48fb (patch) | |
tree | 88ca39218e1fedf94751b927d7e04944a4c66e16 /src/corelib/animation/qvariantanimation.cpp | |
parent | 338fe3c15e90d62606806b0845bb621dd05153ae (diff) | |
parent | fa7f6e542b8381dd3af525507cd6e0a3ee43b813 (diff) |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/gui/kernel/qwidget_win.cpp
Diffstat (limited to 'src/corelib/animation/qvariantanimation.cpp')
-rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index de8185bcbb..c7357783f2 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -621,8 +621,8 @@ bool QVariantAnimation::event(QEvent *event) /*! \reimp */ -void QVariantAnimation::updateState(QAbstractAnimation::State oldState, - QAbstractAnimation::State newState) +void QVariantAnimation::updateState(QAbstractAnimation::State newState, + QAbstractAnimation::State oldState) { Q_UNUSED(oldState); Q_UNUSED(newState); |