aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qml/doc/src/javascript/dynamicobjectcreation.qdoc4
-rw-r--r--src/quick/doc/snippets/qml/transition-animation.qml13
-rw-r--r--src/quick/util/qquicktransition.cpp2
3 files changed, 14 insertions, 5 deletions
diff --git a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc
index 4342d3bada..f20111d154 100644
--- a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc
+++ b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc
@@ -11,10 +11,6 @@ useful to delay instantiation of objects until necessary, thereby improving
application startup time. It also allows visual objects to be dynamically
created and added to the scene in reaction to user input or other events.
-See the \l {QML Example - Dynamic Scene}{Dynamic Scene example} for a
-demonstration of the concepts discussed on this page.
-
-
\section1 Creating Objects Dynamically
There are two ways to create objects dynamically from JavaScript. You can
diff --git a/src/quick/doc/snippets/qml/transition-animation.qml b/src/quick/doc/snippets/qml/transition-animation.qml
new file mode 100644
index 0000000000..a0482018ad
--- /dev/null
+++ b/src/quick/doc/snippets/qml/transition-animation.qml
@@ -0,0 +1,13 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import QtQuick
+
+
+Item {
+//![0]
+ transitions: Transition {
+ PropertyAnimation { duration: 3000 }
+ ColorAnimation { duration: 3000 }
+ }
+//![0]
+}
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp
index 09d92ddb36..33f67265cf 100644
--- a/src/quick/util/qquicktransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -424,7 +424,7 @@ bool QQuickTransition::running() const
This property holds a list of the animations to be run for this transition.
- \snippet ../qml/dynamicscene/dynamicscene.qml top-level transitions
+ \snippet qml/transition-animation.qml 0
The top-level animations are run in parallel. To run them sequentially,
define them within a SequentialAnimation: