diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-13 04:49:40 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-13 04:49:40 (GMT) |
| commit | 14821863b830b85ccb29df217a52f1ca52c9c421 (patch) | |
| tree | 472e41f9c7e54cc6c9ea1fe1d63218d2960876ea /src/declarative/util/qmltransition.cpp | |
| parent | f2d9bdb36061b4b419e777075027f609bf9890b2 (diff) | |
| parent | f7b6358f0d8ff9cad1fd1fcb9622fad40cb0f0b0 (diff) | |
| download | Qt-14821863b830b85ccb29df217a52f1ca52c9c421.zip Qt-14821863b830b85ccb29df217a52f1ca52c9c421.tar.gz Qt-14821863b830b85ccb29df217a52f1ca52c9c421.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/declarative/globalobject.qdoc
Diffstat (limited to 'src/declarative/util/qmltransition.cpp')
| -rw-r--r-- | src/declarative/util/qmltransition.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp index 7eb9e53..204887c 100644 --- a/src/declarative/util/qmltransition.cpp +++ b/src/declarative/util/qmltransition.cpp @@ -111,7 +111,7 @@ public: public: AnimationList() : parent(0) {} virtual void append(QmlAbstractAnimation *a); - virtual void clear() { QmlConcreteList<QmlAbstractAnimation *>::clear(); } //XXX + virtual void clear() { QmlConcreteList<QmlAbstractAnimation *>::clear(); } //### QmlTransitionPrivate *parent; }; @@ -127,7 +127,6 @@ void QmlTransitionPrivate::AnimationList::append(QmlAbstractAnimation *a) void ParallelAnimationWrapper::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { QParallelAnimationGroup::updateState(newState, oldState); - //XXX not 100% guaranteed to be at end (if there are many zero duration animations at the end)? if (newState == Stopped && ((direction() == QAbstractAnimation::Forward && currentLoopTime() == duration()) || (direction() == QAbstractAnimation::Backward && currentLoopTime() == 0))) |