diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-06 22:55:48 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-06 22:55:48 +0100 |
| commit | 360a51d64c607f5efae7a4f25a9a519424399b69 (patch) | |
| tree | 874eb46ab469865ce9d9b58b9d1cf86d49e5bd1c /src/corelib/animation/qvariantanimation.h | |
| parent | 7359baee83f6691c31a0a14ffd6f6cc147ed71fd (diff) | |
| parent | 2b91557c93354b766c78cbc4ab48bcd58207bf1a (diff) | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/corelib/animation/qvariantanimation.h')
| -rw-r--r-- | src/corelib/animation/qvariantanimation.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index bc57b1c076..89d9b3425c 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -103,7 +103,7 @@ protected: bool event(QEvent *event); void updateCurrentTime(int); - void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState); + void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState); virtual void updateCurrentValue(const QVariant &value) = 0; virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const; |