diff options
| -rw-r--r-- | src/quick/doc/src/concepts/statesanimations/animations.qdoc | 8 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickstackview.cpp | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/quick/doc/src/concepts/statesanimations/animations.qdoc b/src/quick/doc/src/concepts/statesanimations/animations.qdoc index 5867fe9585..b2998e3b75 100644 --- a/src/quick/doc/src/concepts/statesanimations/animations.qdoc +++ b/src/quick/doc/src/concepts/statesanimations/animations.qdoc @@ -34,7 +34,7 @@ \section1 Animation and Transitions Types \list -\li \l {Transition} - Animates transitions during state changes +\li \l [QML] {Transition} - Animates transitions during state changes \li \l {SequentialAnimation} - Runs animations sequentially \li \l {ParallelAnimation} - Runs animations in parallel \li \l {Behavior} - Specifies a default animation for property changes @@ -145,9 +145,9 @@ values. abrupt property changes; animations smooth transitions to produce visually appealing state changes. -The \l{Transition} type can contain animation types to interpolate property changes -caused by state changes. To assign the transition to an object, bind it to the -\c transitions property. +The \l [QML] {Transition} type can contain animation types to interpolate +property changes caused by state changes. To assign the transition to an object, +bind it to the \c transitions property. A button might have two states, the \c pressed state when the user clicks on the button and a \c released state when the user releases the button. We can assign diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp index 1a5a5e48b1..b94a072173 100644 --- a/src/quicktemplates2/qquickstackview.cpp +++ b/src/quicktemplates2/qquickstackview.cpp @@ -188,10 +188,10 @@ QT_BEGIN_NAMESPACE \e{Deep linking} means launching an application into a particular state. For example, a newspaper application could be launched into showing a - particular article, bypassing the topmost item. In terms of StackView, deep linking means the ability to modify - the state of the stack, so much so that it is possible to push a set of - items to the top of the stack, or to completely reset the stack to a given - state. + particular article, bypassing the topmost item. In terms of StackView, deep + linking means the ability to modify the state of the stack, so much so that + it is possible to push a set of items to the top of the stack, or to + completely reset the stack to a given state. The API for deep linking in StackView is the same as for basic navigation. Pushing an array instead of a single item adds all the items in that array @@ -242,9 +242,9 @@ QT_BEGIN_NAMESPACE For each push or pop operation, different transition animations are applied to entering and exiting items. These animations define how the entering item should animate in, and the exiting item should animate out. The animations - can be customized by assigning different \l{Transition}s for the - \l pushEnter, \l pushExit, \l popEnter, \l popExit, \l replaceEnter, and - \l replaceExit properties of StackView. + can be customized by assigning different \l [QML] {Transition} {Transitions} + for the \l pushEnter, \l pushExit, \l popEnter, \l popExit, replaceEnter, + and \l replaceExit properties of StackView. \note The transition animations affect each others' transitional behavior. Customizing the animation for one and leaving the other may give unexpected |