aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorChris Adams <christopher.adams@nokia.com>2012-08-20 17:13:48 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-27 08:13:24 +0200
commite98a8b69cc0d900581942872b76ae81dc24931ee (patch)
tree57a7fbae87a5936336e0d0a345a16adc4894de8d /src/quick
parent965588737321d10fd1fbca3f89b4c6257b7b5d47 (diff)
Move the Property Modifier Type documentation
Property Modifier Types are just another sort of QML object type, and don't deserve explicit top-level documentation. This commit moves the docs into the object types documentation, and adds documentation to the syntax page about the "<PropertyModifierObject> on <propertyName>" syntax. Change-Id: Ia9b707739b562d2c8b75fa99b88795ba4d415cf7 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/doc/src/concepts/statesanimations/topic.qdoc25
1 files changed, 25 insertions, 0 deletions
diff --git a/src/quick/doc/src/concepts/statesanimations/topic.qdoc b/src/quick/doc/src/concepts/statesanimations/topic.qdoc
index e909dbc5dd..b498a28079 100644
--- a/src/quick/doc/src/concepts/statesanimations/topic.qdoc
+++ b/src/quick/doc/src/concepts/statesanimations/topic.qdoc
@@ -90,6 +90,31 @@ and transition elements. See the documentation on
and how to use them.
+\section1 Animating Property Assignments
+
+Animations are not only related to states and transitions between states. For
+example, an animation might be triggered by other events, which are not
+associated with a distinct state.
+
+It is often beneficial to always animate changes to certain properties of
+visual items, regardless of the cause of the change (for example, opacity
+effects). Qt Quick provides the \l Behavior type which allows the client to
+specify animation behavior for changes to properties. The \l Behavior type
+is an example of a QML object
+\l{qtqml-cppintegration-definetypes.html#property-modifier-types}
+{property modifier}.
+
+Please see the documentation about
+\l{qtquick-statesanimations-animations.html#default-animation-as-behaviors}
+{default property animations} for more information about using the \l Behavior
+element to provide default property change animations.
+
+It is important to note, that using default property animations (via the
+\l Behavior type) in combination with state-transition animations can sometimes
+result in undefined behavior occurring. Please see the documentation about
+\l{qtquick-statesanimations-behaviors.html}
+{using Qt Quick Behaviors with States} for more information about this topic.
+
\section1 Animated Sprites
The concept of animated sprites is separate to the concept of animations as