diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 01:00:16 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-18 13:49:23 +0100 |
| commit | e912c646e22f845cf14f82532fb2c05628371974 (patch) | |
| tree | 55f82c3f5b3d30f0d13cc0b92bacddf7f66e0baa /src/quick | |
| parent | dc3e3090d21339d78abc706369117b3396c843af (diff) | |
| parent | f396cc753da75c68c6a501379a18df3099697f42 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/qml/compiler/qv4codegen.cpp
Change-Id: I66b7db42bf208855889094ace0267326595ce03c
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/doc/src/concepts/statesanimations/states.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/doc/src/concepts/statesanimations/states.qdoc b/src/quick/doc/src/concepts/statesanimations/states.qdoc index b695713091..5592ccd25d 100644 --- a/src/quick/doc/src/concepts/statesanimations/states.qdoc +++ b/src/quick/doc/src/concepts/statesanimations/states.qdoc @@ -120,7 +120,7 @@ interpolation behaviors are definable. The {Animation and Transitions} article has more information about creating state animations. -The \l {animation/states}{States and Transitions example} +The \l {Qt Quick Examples - Animation}{Animation} example demonstrates how to declare a basic set of states and apply animated transitions between them. |