AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename all occurences of qdoc3 to qdoc in the qdoc manual.

Browse Source 
Change-Id: I84cfab5a7130aff9ed8a6eb568d78f29167e1ac8
Reviewed-by: Martin Smith <martin.smith@nokia.com>
This commit is contained in:
Casper van Donderen 2012-03-14 15:01:36 +01:00 committed by Qt by Nokia
parent 33ea784aa8
commit e164353d85
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/qdoc/doc/config/qdoc-project.qdocconf
View File

@ -28,8 +28,8 @@ exampledirs = .. \
imagedirs = ../../../doc/src/templates/images \
images
outputdir = $$MODULE_BUILD_TREE/tools/qdoc3/doc/html
tagfile = $$MODULE_BUILD_TREE/tools/qdoc3/doc/html/qdoc.tags
outputdir = $$MODULE_BUILD_TREE/tools/qdoc/doc/html
tagfile = $$MODULE_BUILD_TREE/tools/qdoc/doc/html/qdoc.tags
qhp.projects = QDoc

2
src/tools/qdoc/doc/qdoc-guide.qdoc
View File

@ -89,7 +89,7 @@
To run qdoc, the project configuration file is supplied as an argument.
\code
qdoc3 project.qdocconf
qdoc project.qdocconf
\endcode
The project configuration contains information that qdoc uses to create the

12
src/tools/qdoc/doc/qdoc-manual.qdoc
View File

@ -138,11 +138,11 @@
\section1 Running QDoc
The current name of the QDoc program is \c {qdoc3}. To run qdoc3
The current name of the QDoc program is \c {qdoc}. To run qdoc
from the command line, give it the name of a configuration file:
\quotation
\c {$ ../../bin/qdoc3 ./config.qdocconf}
\c {$ ../../bin/qdoc ./config.qdocconf}
\endquotation
QDoc recognizes the \c {.qdocconf} suffix as a \l{The QDoc
@ -2907,7 +2907,7 @@
\li Tutorial and Examples
\endlist
\warning There appears to be a bug in qdoc3 here. If you include
\warning There appears to be a bug in qdoc here. If you include
any of the argument types, you get a numeric list. We're looking
into it.
@ -7062,7 +7062,7 @@
QDoc on the command line:
\quotation
\c {/current/dir$ ../../bin/qdoc3 ./config.qdocconf}
\c {/current/dir$ ../../bin/qdoc ./config.qdocconf}
\endquotation
\section1 General Description
@ -7307,7 +7307,7 @@
looking for \e qt5. For example, this file would be:
\code
~/depot/qt5/qtdoc/tools/qdoc3/doc/qdoc-manual.qdoc
~/depot/qt5/qtdoc/tools/qdoc/doc/qdoc-manual.qdoc
\endcode
QDoc scans the path for the basedir \e{qt5} and the next subdirectory
@ -7365,7 +7365,7 @@
line using the -D option. For example:
\code
currentdirectory$ qdoc3 -Dconsoleedition qt.qdocconf
currentdirectory$ qdoc -Dconsoleedition qt.qdocconf
\endcode
In this case the -D option ensures that the \c consoleedition