diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-25 04:10:54 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-25 04:10:54 (GMT) |
| commit | 3570cb083def4c91d147ceab561ea449646ab515 (patch) | |
| tree | c69d29ddba0dc5346dd9a56493a3511ae829874a /doc | |
| parent | 3c5f26079d20ffb6bac924e3686e717f499afbf7 (diff) | |
| parent | e150b84c8069e47a9fc6a4a2ad6e5b71f7cfc24c (diff) | |
| download | Qt-3570cb083def4c91d147ceab561ea449646ab515.zip Qt-3570cb083def4c91d147ceab561ea449646ab515.tar.gz Qt-3570cb083def4c91d147ceab561ea449646ab515.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/example-slideswitch.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc index c942918..a8376eb 100644 --- a/doc/src/declarative/example-slideswitch.qdoc +++ b/doc/src/declarative/example-slideswitch.qdoc @@ -127,7 +127,7 @@ For more information on scripts see \l{qmlecmascript.html}{ECMAScript Blocks}. \snippet examples/declarative/slideswitch/content/Switch.qml 7 At this point, when the switch toggles between the two states the knob will instantly change its \c x position between 1 and 78. -In order for the the knob to move smoothly we add a transistion that will animate the \c x property with an easing curve for a duration of 200ms. +In order for the the knob to move smoothly we add a transition that will animate the \c x property with an easing curve for a duration of 200ms. For more information on transitions see \l{state-transitions}{QML Transitions}. |