diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2012-05-07 13:06:02 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-09 00:56:16 +0200 |
| commit | 727180c98472d94ec393e8fb15bb0938ddacb2a0 (patch) | |
| tree | 04426756896b1ec840f7f68bdcca8451bd09644c /src/quick/util/qquicktransition.cpp | |
| parent | 0b1ab6ba5553ecd0ba485d0d4a1aead83482fb46 (diff) | |
Doc: Moving Qt Quick docs for new doc structure
-moved documentation from
doc/src/qtquick2
doc/src/localstorage
doc/src/particles
to src/quick/doc/
-fixed qdocconf file
-fixed snippets, images, and other qdoc errors related to the new
directories
-fixed links in the main Qt Quick page
Change-Id: Ie3408c2624f623c17de07e5635d5c7284d02b973
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/quick/util/qquicktransition.cpp')
| -rw-r--r-- | src/quick/util/qquicktransition.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp index 0f6ccb238b..300dda1479 100644 --- a/src/quick/util/qquicktransition.cpp +++ b/src/quick/util/qquicktransition.cpp @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE changes between the default and the "moved" state, any changes to the \c x and \c y properties should be animated, using an \c Easing.InOutQuad. - \snippet doc/src/snippets/qml/transition.qml 0 + \snippet doc/snippets/qml/transition.qml 0 Notice the example does not require \l{PropertyAnimation::}{to} and \l{PropertyAnimation::}{from} values for the NumberAnimation. As a convenience, @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE To define multiple transitions, specify \l Item::transitions as a list: - \snippet doc/src/snippets/qml/transitions-list.qml list of transitions + \snippet doc/snippets/qml/transitions-list.qml list of transitions If multiple Transitions are specified, only a single (best-matching) Transition will be applied for any particular state change. In the example above, when changing to \c state1, the first transition will be used, rather @@ -283,11 +283,11 @@ QQuickTransitionInstance *QQuickTransition::prepare(QQuickStateOperation::Action properties, so the animation is always applied when changing between the two states (i.e. when the mouse is pressed and released). - \snippet doc/src/snippets/qml/transition-from-to.qml 0 + \snippet doc/snippets/qml/transition-from-to.qml 0 If the transition was changed to this: - \snippet doc/src/snippets/qml/transition-from-to-modified.qml modified transition + \snippet doc/snippets/qml/transition-from-to-modified.qml modified transition The animation would only be applied when changing from the default state to the "brighter" state (i.e. when the mouse is pressed, but not on release). @@ -330,7 +330,7 @@ void QQuickTransition::setFromState(const QString &f) transition applies a sequential animation when the mouse is pressed, and reverses the sequence of the animation when the mouse is released: - \snippet doc/src/snippets/qml/transition-reversible.qml 0 + \snippet doc/snippets/qml/transition-reversible.qml 0 If the transition did not set the \c to and \c reversible values, then on the mouse release, the transition would play the PropertyAnimation @@ -436,7 +436,7 @@ bool QQuickTransition::running() const The top-level animations are run in parallel. To run them sequentially, define them within a SequentialAnimation: - \snippet doc/src/snippets/qml/transition-reversible.qml sequential animations + \snippet doc/snippets/qml/transition-reversible.qml sequential animations */ QQmlListProperty<QQuickAbstractAnimation> QQuickTransition::animations() { |