summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-07-16 05:56:42 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-07-16 05:56:42 (GMT)
commit875ae40157aa9a34e0b74941fa905f7445c365df (patch)
tree69dc17fa0f32be5b2c672792e221b7b227cf8079
parent368dec26e5dccd6bbaf4f485180bc2ce47294953 (diff)
downloadQt-875ae40157aa9a34e0b74941fa905f7445c365df.zip
Qt-875ae40157aa9a34e0b74941fa905f7445c365df.tar.gz
Qt-875ae40157aa9a34e0b74941fa905f7445c365df.tar.bz2
Minor animation doc improvement
-rw-r--r--doc/src/declarative/animation.qdoc4
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp3
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index c5333df..401cf16 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -67,7 +67,9 @@ A property animation can also be specified as a resource that is manipulated fro
\snippet doc/src/snippets/declarative/animation.qml property-anim-3
As can be seen, when an animation is used like this (as opposed to as a value source) you will need
-to explicitly set the \c target and \c property to animate.
+to explicitly set the \c target and \c property to animate. This also the only case where
+an animation needs to be started explictly by either setting the \c running property to
+true or calling the \c start() method.
Animations can be joined into a group using SequentialAnimation and ParallelAnimation.
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index bdb9510..5005746 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1671,6 +1671,9 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
different. For more information see the individual property documentation, as well
as the \l{QML Animation} introduction.
+ Note that PropertyAnimation inherits the abstract \l Animation element.
+ This includes additional properties and methods for controlling the animation.
+
\sa {QML Animation}, {declarative/animation/basics}{Animation basics example}
*/