summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-11-06 05:08:33 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-11-06 05:08:33 (GMT)
commit2ae8e6f13f5bffd639a279c7e4aeb6b4d49810a1 (patch)
tree5c018993411be406751ac3c7790b50d4fd85f0a0 /src/declarative/util
parentcd9f07d8c488ff35cceb73924af4da4bdc10a647 (diff)
downloadQt-2ae8e6f13f5bffd639a279c7e4aeb6b4d49810a1.zip
Qt-2ae8e6f13f5bffd639a279c7e4aeb6b4d49810a1.tar.gz
Qt-2ae8e6f13f5bffd639a279c7e4aeb6b4d49810a1.tar.bz2
Update animation docs.
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmlanimation.cpp18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 7c5bc50..94cdadf 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -1507,6 +1507,8 @@ void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
\code
VariantAnimation { property: "size"; to: "20x20"; duration: 200 }
\endcode
+
+ \a qmlanimation.html
*/
QmlPropertyAnimation::QmlPropertyAnimation(QObject *parent)
@@ -1795,16 +1797,20 @@ void QmlPropertyAnimation::setEasing(const QString &e)
\qmlproperty Object PropertyAnimation::target
This property holds an explicit target object to animate.
- The exact effect of the \c target property depends on how the animation
- is being used. Refer to the \l animation documentation for details.
+ target is used in conjunction with property to determine
+ what property should be animated.
+
+ \sa property matchTargets
*/
/*!
\qmlproperty string PropertyAnimation::property
- This property holds an explicit property to animated.
+ This property holds an explicit property name to animate.
- The exact effect of the \c property property depends on how the animation
- is being used. Refer to the \l animation documentation for details.
+ property is used in conjunction with target to determine
+ what property should be animated.
+
+ \sa target matchProperties
*/
/*!
@@ -1833,6 +1839,8 @@ void QmlPropertyAnimation::setEasing(const QString &e)
This property is typically used for an animation appearing as part of a Transition.
By default, no property names will be matched.
+
+ \sa matchTargets PropertyAction::matchTargets
*/
QString QmlPropertyAnimation::properties() const
{