summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativebehavior.cpp
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-08-05 06:01:56 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-08-05 06:07:39 (GMT)
commita9aaaf30b6c542b5c9e3c1e1681088ab26a530c0 (patch)
treebac924df632b3cf4ecc1f572f7ec795bf15ac281 /src/declarative/util/qdeclarativebehavior.cpp
parent2ee9d1cd0b7ee5b8973a286f56943a61350cdc67 (diff)
downloadQt-a9aaaf30b6c542b5c9e3c1e1681088ab26a530c0.zip
Qt-a9aaaf30b6c542b5c9e3c1e1681088ab26a530c0.tar.gz
Qt-a9aaaf30b6c542b5c9e3c1e1681088ab26a530c0.tar.bz2
Improve docs on QML Animation page and associated elements
Task-number: QTBUG-12666
Diffstat (limited to 'src/declarative/util/qdeclarativebehavior.cpp')
-rw-r--r--src/declarative/util/qdeclarativebehavior.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index fadb2ae..1e7f81a 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -84,12 +84,15 @@ public:
\snippet doc/src/snippets/declarative/behavior.qml 0
- To run multiple animations within a Behavior, use ParallelAnimation or
+ Note that a property cannot have more than one assigned Behavior. To provide
+ multiple animations within a Behavior, use ParallelAnimation or
SequentialAnimation.
- Note that a property cannot have more than one assigned Behavior.
+ If a \l{QML States}{state change} has a \l Transition that matches the same property as a
+ Behavior, the \l Transition animation overrides the Behavior for that
+ state change.
- \sa {Property Behaviors}, {declarative/animation/behaviors}{Behavior example}, QtDeclarative
+ \sa {QML Animation}, {declarative/animation/behaviors}{Behavior example}, QtDeclarative
*/