summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2013-01-23 12:37:22 +0100
committerLeena Miettinen <riitta-leena.miettinen@digia.com>2013-01-23 12:42:07 +0100
commit75f1e8a66ff6f8ab5df294de98803de697808a12 (patch)
tree2ca0be1e32cdbfbc5b766fea32f89a3e36c3ab85
parent3f570a79019294d884e363d2c8ef763ab373afd8 (diff)
downloadqt-creator-75f1e8a66ff6f8ab5df294de98803de697808a12.tar.gz
Doc: fix missing snippets
Add the path to the snippets folder to the qdocconf file and fix the paths in \snippet commands in the source file. Change-Id: Iebabec6919b580e6d1474685777862200d314a83 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--doc/config/qtcreator-project.qdocconf3
-rw-r--r--doc/src/qtquick/qtquick-app-tutorial.qdoc8
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index 2d32655edf..e0eb7ce797 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -5,7 +5,8 @@ headerdirs =
sourcedirs = $SRCDIR/src
imagedirs = $SRCDIR/images $SRCDIR/templates/images
outputdir = $OUTDIR
-exampledirs = $SRCDIR/examples
+exampledirs = $SRCDIR/examples \
+ $SRCDIR/snippets
indexes = qt.index
include(compat.qdocconf)
diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc
index 225ade41e7..45e79d8ba1 100644
--- a/doc/src/qtquick/qtquick-app-tutorial.qdoc
+++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc
@@ -293,7 +293,7 @@
expressions for the x and y properties, as illustrated by the
following code snippet:
- \snippet snippets/qml/states-properties.qml states
+ \snippet qml/states-properties.qml states
\image qmldesigner-tutorial-state1.png "States"
@@ -319,7 +319,7 @@
moving to State1, the x and y coordinates of the Qt logo change
linearly over a duration of 1 second:
- \snippet snippets/qml/list-of-transitions.qml first transition
+ \snippet qml/list-of-transitions.qml first transition
\o You can use the Qt Quick toolbar for animation to change the easing
curve type from linear to OutBounce:
@@ -342,13 +342,13 @@
and y coordinates of the Qt logo change over a duration of 2
seconds, and an InOutQuad easing function is used:
- \snippet snippets/qml/list-of-transitions.qml second transition
+ \snippet qml/list-of-transitions.qml second transition
\o Add the following code to specify that for any other state changes,
the x and y coordinates of the Qt logo change linearly over a
duration of 200 milliseconds:
- \snippet snippets/qml/list-of-transitions.qml default transition
+ \snippet qml/list-of-transitions.qml default transition
\o Press \key {Ctrl+R} to run the application.