diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-11-24 01:02:53 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-11-24 01:02:53 (GMT) |
| commit | 3639261fb803c25af17bf8c1563521477da7d1a6 (patch) | |
| tree | 2500afb14e5cc031486a100f9d28e68a98f3027d /doc/src/declarative | |
| parent | 3a54043bc2c9640a2ab0fe003937d0af1bf67c7b (diff) | |
| download | Qt-3639261fb803c25af17bf8c1563521477da7d1a6.zip Qt-3639261fb803c25af17bf8c1563521477da7d1a6.tar.gz Qt-3639261fb803c25af17bf8c1563521477da7d1a6.tar.bz2 | |
Doc.
Diffstat (limited to 'doc/src/declarative')
| -rw-r--r-- | doc/src/declarative/animation.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/declarative/qmlstates.qdoc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc index 1314493..d05a444 100644 --- a/doc/src/declarative/animation.qdoc +++ b/doc/src/declarative/animation.qdoc @@ -186,7 +186,7 @@ Transition { } \endcode -To insert an explicit animation into your transition, you can use \target and \property as normal. +To insert an explicit animation into your transition, you can use \c target and \c property as normal. \code Transition { @@ -214,8 +214,8 @@ Transition { \section1 Property Behaviors -A property behavior specifies a default animation to run whenever the property's value changes, regardless -of what caused the change. Unlike Transition, Behavior doesn't provide a way to indicate that a Behavior +A \l{Behavior}{property behavior} specifies a default animation to run whenever the property's value changes, regardless +of what caused the change. Unlike Transition, \l Behavior doesn't provide a way to indicate that a Behavior should only apply under certain circumstances. In the following snippet, we specify that we want the x position of redRect to be animated diff --git a/doc/src/declarative/qmlstates.qdoc b/doc/src/declarative/qmlstates.qdoc index 261e3f5..ddb0fc8 100644 --- a/doc/src/declarative/qmlstates.qdoc +++ b/doc/src/declarative/qmlstates.qdoc @@ -3,7 +3,7 @@ \target qmlstates \title QML States -QML states describe user interface configurations, including: +QML states typically describe user interface configurations, including: \list \o What UI elements are present \o The properties of those elements (including how they behave) @@ -52,7 +52,7 @@ To animate state changes, you can use \l{state-transitions}{transitions}. Other things you can do in a state change: \list \o override signal handlers with PropertyChanges -\o change an item's parent with ParentChange +\o change an item's visual parent with ParentChange \o change an item's anchors with AnchorChanges \o run some script with StateChangeScript \endlist |