aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eliasson <andreas.eliasson@qt.io>2022-03-11 10:47:14 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-14 08:10:12 +0000
commit3f352c5cccf410cc8e9233c209d1e7f57ff1c9db (patch)
treebf3793461503d74441b1736e289437d6621cdfef
parenteae294de902902d1aae4745926e45acde91a7882 (diff)
Doc: Fix ambiguous transition qml type links
Add the sqaure bracket argument to the link command to make sure the links go to the correct qml type page. Also, fix some line lengths in the c++ file to bypass the clang-format warning, which wouldn't allow me to commit. Task-number: QTBUG-101193 Change-Id: I45e22bdbec354de96b3598773b74d1754eda8a64 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> (cherry picked from commit 2af09901418d5639a2c105369559ab925cd7166b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/quick/doc/src/concepts/statesanimations/animations.qdoc8
-rw-r--r--src/quicktemplates2/qquickstackview.cpp14
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