diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-02-16 01:59:27 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-02-18 05:17:13 (GMT) |
| commit | ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6 (patch) | |
| tree | 144a7a8f3208d9388b8666d26aa0a231b325b87f /src/declarative/util/qmlbehavior.cpp | |
| parent | 635b329592f26d64eeb6212b6056249b15293dcf (diff) | |
| download | Qt-ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6.zip Qt-ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6.tar.gz Qt-ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6.tar.bz2 | |
Get rid of the matchProperties/properties distinction, as it
has proven to be confusing in practice.
property/target and properties/targets will be functionally equivilant
(the only distinction being singular/plural). In a transition these
properties can be used for both 'matching' and explicit animation
based on whether a 'to' value is supplied.
The documentation, tests, examples and demos have been updated as well.
Diffstat (limited to 'src/declarative/util/qmlbehavior.cpp')
| -rw-r--r-- | src/declarative/util/qmlbehavior.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp index e8feeaa..5e11dea 100644 --- a/src/declarative/util/qmlbehavior.cpp +++ b/src/declarative/util/qmlbehavior.cpp @@ -125,7 +125,7 @@ void QmlBehavior::setAnimation(QmlAbstractAnimation *animation) d->animation = animation; if (d->animation) - d->animation->setTarget(d->property); + d->animation->setDefaultTarget(d->property); } /*! @@ -183,7 +183,7 @@ void QmlBehavior::setTarget(const QmlMetaProperty &property) d->property = property; d->currentValue = property.read(); if (d->animation) - d->animation->setTarget(property); + d->animation->setDefaultTarget(property); } QT_END_NAMESPACE |