feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Avoid pulling in "Extending Manual" into Qt Creator manual.

Browse Source 
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>
This commit is contained in:
Eike Ziller
2012-12-17 11:14:21 +01:00
parent 175fbece76
commit cf937f09d6
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/config/qtcreator-project.qdocconf
View File

@@ -5,7 +5,7 @@ headerdirs =
sourcedirs = $SRCDIR/src sourcedirs = $SRCDIR/src
imagedirs = $SRCDIR/images $SRCDIR/templates/images imagedirs = $SRCDIR/images $SRCDIR/templates/images
outputdir = $OUTDIR outputdir = $OUTDIR
exampledirs = $SRCDIR exampledirs = $SRCDIR/examples
indexes = qt.index indexes = qt.index
include(compat.qdocconf) include(compat.qdocconf)

6
doc/src/qtquick/qtquick-app-tutorial.qdoc
View File

@@ -207,7 +207,7 @@
The qml.main file should now look as follows: 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 \o In the \gui Navigator pane, copy topLeftRect (by pressing
\key {Ctrl+C}) and paste it to the canvas twice (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: 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 \endlist
@@ -360,6 +360,6 @@
When you have completed the steps, the main.qml file should look as follows: 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
*/ */

10
doc/src/widgets/qtdesigner-app-tutorial.qdoc
View File

@@ -216,7 +216,7 @@
\c{Ui::TextFinder} pointer, as illustrated by the following code \c{Ui::TextFinder} pointer, as illustrated by the following code
snippet: snippet:
\snippet examples/textfinder/textfinder.h 0 \snippet textfinder/textfinder.h 0
\endlist \endlist
@@ -236,12 +236,12 @@
{setPlainText()}. {setPlainText()}.
This is illustrated by the following code snippet: 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 \o To use QFile and QTextStream, add the following #includes to
textfinder.cpp: 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 \o For the \c{on_findButton_clicked()} slot, add code to extract the
search string and use the search string and use the
@@ -250,13 +250,13 @@
to look for the search string within the text file. This is to look for the search string within the text file. This is
illustrated by the following code snippet: 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 \o Once both of these functions are complete, add a line to call
\c{loadTextFile()} in the constructor, as illustrated by the \c{loadTextFile()} in the constructor, as illustrated by the
following code snippet: following code snippet:
\snippet examples/textfinder/textfinder.cpp 3 \snippet textfinder/textfinder.cpp 3
\endlist \endlist

12
doc/src/widgets/qtdesigner-plugins.qdoc
View File

@@ -87,13 +87,13 @@
\o To check the paths used in the Qwt library, enter the following \o To check the paths used in the Qwt library, enter the following
\c otool command: \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 The output for Qwt 5.2.1 indicates that the plugin uses Qt core
libraries (QtDesigner, QtScript, QtXml, QtGui and QtCore) and libraries (QtDesigner, QtScript, QtXml, QtGui and QtCore) and
libqwt.5.dylib: 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 \o You must copy the \QD plugin and the Qwt library files to the
@@ -110,21 +110,21 @@
Enter the following commands: 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 \o Enter the following \c otool command to check the libraries that are
used by the Qwt library: used by the Qwt library:
\snippet examples/doc_src_plugins.qdoc 2 \snippet doc_src_plugins.qdoc 2
The command returns the following output: 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 \o Enter the following \c install_name_tool command to fix the
references of the libraries: references of the libraries:
\snippet examples/doc_src_plugins.qdoc 5 \snippet doc_src_plugins.qdoc 5
\endlist \endlist