diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-01 08:21:39 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-01 11:20:54 (GMT) |
commit | 5118020e63f5e634a74082c417362d735a7a2303 (patch) | |
tree | e8825b7d0960d260e124e22cbb6263bc5e01bb53 /src/declarative/util/qmltransition.cpp | |
parent | 59a3b7d39e75884027decdd8a029062f0fdde32a (diff) | |
download | Qt-5118020e63f5e634a74082c417362d735a7a2303.zip Qt-5118020e63f5e634a74082c417362d735a7a2303.tar.gz Qt-5118020e63f5e634a74082c417362d735a7a2303.tar.bz2 |
Remove QmlSetProperty
This involves the introduction of separation between states and transition application. This was necessary to allow layouts to continue to use transitions.
Diffstat (limited to 'src/declarative/util/qmltransition.cpp')
-rw-r--r-- | src/declarative/util/qmltransition.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp index 5931075..ccd0293 100644 --- a/src/declarative/util/qmltransition.cpp +++ b/src/declarative/util/qmltransition.cpp @@ -46,6 +46,7 @@ #include "qmlstateoperations.h" #include "qmlanimation.h" #include "qmlanimation_p.h" +#include "qmltransitionmanager_p.h" #include <QParallelAnimationGroup> QT_BEGIN_NAMESPACE @@ -92,7 +93,7 @@ public: bool reversed; bool reversible; ParallelAnimationWrapper *group; - QmlState *endState; + QmlTransitionManager *endState; void init() { @@ -103,7 +104,7 @@ public: void complete() { - endState->d_func()->complete(); + endState->complete(); } class AnimationList : public QmlConcreteList<QmlAbstractAnimation *> @@ -161,7 +162,7 @@ void QmlTransition::setReversed(bool r) void QmlTransition::prepare(QmlStateOperation::ActionList &actions, QList<QmlMetaProperty> &after, - QmlState *endState) + QmlTransitionManager *endState) { Q_D(QmlTransition); |