summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlanimation.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-01-29 01:53:32 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-01-29 01:53:32 (GMT)
commit91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d (patch)
treeef09bd890041b3c44f7be3322321c96174e94054 /src/declarative/util/qmlanimation.cpp
parent687d50f05a1a2d9355f0990e845967930c57b985 (diff)
parentfe129a59ab54e6c0194c546a02bc64e886c252d5 (diff)
downloadQt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.zip
Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.tar.gz
Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlanimation.cpp')
-rw-r--r--src/declarative/util/qmlanimation.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index f5333a6..efb4159 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -1660,10 +1660,12 @@ void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
\inherits Animation
\brief The PropertyAnimation element allows you to animate property changes.
- Animate a size property over 200ms, from its current size to 20-by-20:
+ Animate theObject's size property over 200ms, from its current size to 20-by-20:
\code
- PropertyAnimation { property: "size"; to: "20x20"; duration: 200 }
+ PropertyAnimation { target: theObject; property: "size"; to: "20x20"; duration: 200 }
\endcode
+
+ For an introduction to animation in QML, see \l{QML Animation}.
*/
QmlPropertyAnimation::QmlPropertyAnimation(QObject *parent)