diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2015-10-21 12:17:54 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@digia.com> | 2015-10-21 13:02:21 +0000 |
| commit | faf4c8631683a201e8e418993f8cb30f818b72a4 (patch) | |
| tree | beea6ce5f84e7d5582d43d06c033ca6443368d2c /src/quick | |
| parent | 772f0c06f7a88c431f3485be11eaea247ee36f8d (diff) | |
Revert "Doc: corrected not working snippet"
This reverts commit f8bde8841631c6e4fa64a56f77522567455f8709, and
fixes the original problem of a snippet not being found by using
a relative path for the \snippet command.
Change-Id: Ie932beea1ba07cf5b298528ba61b5a45b84cb19b
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 1 | ||||
| -rw-r--r-- | src/quick/util/qquicktransition.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 994772f8aa..044c1696ff 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -43,7 +43,6 @@ sourcedirs += .. \ ../../quickwidgets exampledirs += ../../../examples/quick \ - ../../../examples/qml \ snippets diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp index 2285066544..2eaf8261af 100644 --- a/src/quick/util/qquicktransition.cpp +++ b/src/quick/util/qquicktransition.cpp @@ -432,7 +432,7 @@ bool QQuickTransition::running() const This property holds a list of the animations to be run for this transition. - \snippet dynamicscene/dynamicscene.qml top-level transitions + \snippet ../qml/dynamicscene/dynamicscene.qml top-level transitions The top-level animations are run in parallel. To run them sequentially, define them within a SequentialAnimation: |