diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-30 06:06:18 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-30 06:06:18 (GMT) |
| commit | 2df6a9a02a43d88d2ddb73c08c02ad29712a8fbc (patch) | |
| tree | cea85c3e3334f80b19f420a275dbe1e5b4c6aefa /src/declarative/util/qdeclarativetransition.cpp | |
| parent | ff983ee8257b79143911ca58ebedc49b1660a0c4 (diff) | |
| parent | 2661be1bacdd83d1b3e6207c519c2699edfdc1d0 (diff) | |
| download | Qt-2df6a9a02a43d88d2ddb73c08c02ad29712a8fbc.zip Qt-2df6a9a02a43d88d2ddb73c08c02ad29712a8fbc.tar.gz Qt-2df6a9a02a43d88d2ddb73c08c02ad29712a8fbc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativetransition.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativetransition.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index 4326a55..1e8be7f 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -116,9 +116,9 @@ void QDeclarativeTransitionPrivate::append_animation(QDeclarativeListProperty<QD void ParallelAnimationWrapper::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { QParallelAnimationGroup::updateState(newState, oldState); - if (newState == Stopped && - ((direction() == QAbstractAnimation::Forward && currentLoopTime() == duration()) || - (direction() == QAbstractAnimation::Backward && currentLoopTime() == 0))) + if (newState == Stopped && (duration() == -1 + || (direction() == QAbstractAnimation::Forward && currentLoopTime() == duration()) + || (direction() == QAbstractAnimation::Backward && currentLoopTime() == 0))) { trans->complete(); } |