summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlanimation.cpp
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2009-11-18 03:56:45 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2009-11-18 03:57:54 (GMT)
commitdb56fec07c1a8a0a3a6e006ec2613351241cdf54 (patch)
tree2b92e1c3a27f390bff1eaba6f8b3f55dcd1f190c /src/declarative/util/qmlanimation.cpp
parente2dbda508f2a65e1ca8c31df6339b1bbec14e933 (diff)
downloadQt-db56fec07c1a8a0a3a6e006ec2613351241cdf54.zip
Qt-db56fec07c1a8a0a3a6e006ec2613351241cdf54.tar.gz
Qt-db56fec07c1a8a0a3a6e006ec2613351241cdf54.tar.bz2
Minor doc fixes for animation elements.
Reviewed-by: Martin Jones
Diffstat (limited to 'src/declarative/util/qmlanimation.cpp')
-rw-r--r--src/declarative/util/qmlanimation.cpp22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 780bc82..475978f 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -595,7 +595,7 @@ void QmlAbstractAnimation::timelineComplete()
/*!
\qmlclass PauseAnimation QmlPauseAnimation
\inherits Animation
- \brief The PauseAnimation provides a pause for an animation.
+ \brief The PauseAnimation element provides a pause for an animation.
When used in a SequentialAnimation, PauseAnimation is a step when
nothing happens, for a specified duration.
@@ -668,7 +668,7 @@ QAbstractAnimation *QmlPauseAnimation::qtAnimation()
/*!
\qmlclass ColorAnimation QmlColorAnimation
\inherits PropertyAnimation
- \brief The ColorAnimation allows you to animate color changes.
+ \brief The ColorAnimation element allows you to animate color changes.
\code
ColorAnimation { from: "white"; to: "#c0c0c0"; duration: 100 }
@@ -676,7 +676,7 @@ QAbstractAnimation *QmlPauseAnimation::qtAnimation()
When used in a transition, ColorAnimation will by default animate
all properties of type color that are changing. If a property or properties
- are explicity set for the animation, then those will be used instead.
+ are explicitly set for the animation, then those will be used instead.
*/
/*!
\internal
@@ -731,7 +731,7 @@ QML_DEFINE_TYPE(Qt,4,6,ColorAnimation,QmlColorAnimation)
/*!
\qmlclass ScriptAction QmlScriptAction
\inherits Animation
- \brief The ScriptAction allows scripts to be run during an animation.
+ \brief The ScriptAction element allows scripts to be run during an animation.
*/
/*!
@@ -837,7 +837,7 @@ QML_DEFINE_TYPE(Qt,4,6,ScriptAction,QmlScriptAction)
/*!
\qmlclass PropertyAction QmlPropertyAction
\inherits Animation
- \brief The PropertyAction allows immediate property changes during animation.
+ \brief The PropertyAction element allows immediate property changes during animation.
Explicitly set \c theimage.smooth=true during a transition:
\code
@@ -1303,7 +1303,7 @@ QML_DEFINE_TYPE(Qt,4,6,ParentAction,QmlParentAction)
/*!
\qmlclass NumberAnimation QmlNumberAnimation
\inherits PropertyAnimation
- \brief The NumberAnimation allows you to animate changes in properties of type qreal.
+ \brief The NumberAnimation element allows you to animate changes in properties of type qreal.
Animate a set of properties over 200ms, from their values in the start state to
their values in the end state of the transition:
@@ -1381,7 +1381,7 @@ QmlList<QmlAbstractAnimation *> *QmlAnimationGroup::animations()
/*!
\qmlclass SequentialAnimation QmlSequentialAnimation
\inherits Animation
- \brief The SequentialAnimation allows you to run animations sequentially.
+ \brief The SequentialAnimation element allows you to run animations sequentially.
Animations controlled in SequentialAnimation will be run one after the other.
@@ -1456,7 +1456,7 @@ QML_DEFINE_TYPE(Qt,4,6,SequentialAnimation,QmlSequentialAnimation)
/*!
\qmlclass ParallelAnimation QmlParallelAnimation
\inherits Animation
- \brief The ParallelAnimation allows you to run animations in parallel.
+ \brief The ParallelAnimation element allows you to run animations in parallel.
Animations contained in ParallelAnimation will be run at the same time.
@@ -1580,14 +1580,12 @@ void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
/*!
\qmlclass PropertyAnimation QmlPropertyAnimation
\inherits Animation
- \brief The PropertyAnimation allows you to animate property changes.
+ \brief The PropertyAnimation element allows you to animate property changes.
Animate a size property over 200ms, from its current size to 20-by-20:
\code
- VariantAnimation { property: "size"; to: "20x20"; duration: 200 }
+ PropertyAnimation { property: "size"; to: "20x20"; duration: 200 }
\endcode
-
- \a qmlanimation.html
*/
QmlPropertyAnimation::QmlPropertyAnimation(QObject *parent)