aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2012-12-17 11:14:21 +0100
committerEike Ziller <eike.ziller@digia.com>2012-12-17 12:47:49 +0100
commitcf937f09d6fe7af170393942b116510dcd287815 (patch)
tree6f0f4cbd3e483d537956eb1dce85cc5dd866c398 /doc
parent175fbece767f26c10d72c7533fcac8ffd02407c9 (diff)
Avoid pulling in "Extending Manual" into Qt Creator manual.
With Qt5, qdoc finds the doc/api/*.qdoc files if the examplesdir points to doc/, leading to the two toplevel index.html files ending up within qtcreator.qch Change-Id: I4ac3c1447c6924c4e292024919d52ddb97e1f8cc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/config/qtcreator-project.qdocconf2
-rw-r--r--doc/src/qtquick/qtquick-app-tutorial.qdoc6
-rw-r--r--doc/src/widgets/qtdesigner-app-tutorial.qdoc10
-rw-r--r--doc/src/widgets/qtdesigner-plugins.qdoc12
4 files changed, 15 insertions, 15 deletions
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index def7e7a301..2d32655edf 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -5,7 +5,7 @@ headerdirs =
sourcedirs = $SRCDIR/src
imagedirs = $SRCDIR/images $SRCDIR/templates/images
outputdir = $OUTDIR
-exampledirs = $SRCDIR
+exampledirs = $SRCDIR/examples
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 a08b139104..225ade41e7 100644
--- a/doc/src/qtquick/qtquick-app-tutorial.qdoc
+++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc
@@ -207,7 +207,7 @@
The qml.main file should now look as follows:
- \snippet examples/transitions/qml/Transitions/main.qml 0
+ \snippet transitions/qml/Transitions/main.qml 0
\o In the \gui Navigator pane, copy topLeftRect (by pressing
\key {Ctrl+C}) and paste it to the canvas twice (by pressing
@@ -259,7 +259,7 @@
The qml.main file should now look as follows:
- \snippet examples/transitions/qml/Transitions/main.qml 1
+ \snippet transitions/qml/Transitions/main.qml 1
\endlist
@@ -360,6 +360,6 @@
When you have completed the steps, the main.qml file should look as follows:
- \snippet examples/transitions/qml/Transitions/main.qml 2
+ \snippet transitions/qml/Transitions/main.qml 2
*/
diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
index a1f6599bd4..ee7fab25b4 100644
--- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -216,7 +216,7 @@
\c{Ui::TextFinder} pointer, as illustrated by the following code
snippet:
- \snippet examples/textfinder/textfinder.h 0
+ \snippet textfinder/textfinder.h 0
\endlist
@@ -236,12 +236,12 @@
{setPlainText()}.
This is illustrated by the following code snippet:
- \snippet examples/textfinder/textfinder.cpp 0
+ \snippet textfinder/textfinder.cpp 0
\o To use QFile and QTextStream, add the following #includes to
textfinder.cpp:
- \snippet examples/textfinder/textfinder.cpp 1
+ \snippet textfinder/textfinder.cpp 1
\o For the \c{on_findButton_clicked()} slot, add code to extract the
search string and use the
@@ -250,13 +250,13 @@
to look for the search string within the text file. This is
illustrated by the following code snippet:
- \snippet examples/textfinder/textfinder.cpp 2
+ \snippet textfinder/textfinder.cpp 2
\o Once both of these functions are complete, add a line to call
\c{loadTextFile()} in the constructor, as illustrated by the
following code snippet:
- \snippet examples/textfinder/textfinder.cpp 3
+ \snippet textfinder/textfinder.cpp 3
\endlist
diff --git a/doc/src/widgets/qtdesigner-plugins.qdoc b/doc/src/widgets/qtdesigner-plugins.qdoc
index fed4b0d477..a29ff2843b 100644
--- a/doc/src/widgets/qtdesigner-plugins.qdoc
+++ b/doc/src/widgets/qtdesigner-plugins.qdoc
@@ -87,13 +87,13 @@
\o To check the paths used in the Qwt library, enter the following
\c otool command:
- \snippet examples/doc_src_plugins.qdoc 0
+ \snippet doc_src_plugins.qdoc 0
The output for Qwt 5.2.1 indicates that the plugin uses Qt core
libraries (QtDesigner, QtScript, QtXml, QtGui and QtCore) and
libqwt.5.dylib:
- \snippet examples/doc_src_plugins.qdoc 1
+ \snippet doc_src_plugins.qdoc 1
\o You must copy the \QD plugin and the Qwt library files to the
@@ -110,21 +110,21 @@
Enter the following commands:
- \snippet examples/doc_src_plugins.qdoc 4
+ \snippet doc_src_plugins.qdoc 4
\o Enter the following \c otool command to check the libraries that are
used by the Qwt library:
- \snippet examples/doc_src_plugins.qdoc 2
+ \snippet doc_src_plugins.qdoc 2
The command returns the following output:
- \snippet examples/doc_src_plugins.qdoc 3
+ \snippet doc_src_plugins.qdoc 3
\o Enter the following \c install_name_tool command to fix the
references of the libraries:
- \snippet examples/doc_src_plugins.qdoc 5
+ \snippet doc_src_plugins.qdoc 5
\endlist