diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-14 15:01:36 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 00:50:47 +0100 |
| commit | e164353d851df7c27f7b25ed13fe14a60ef6d799 (patch) | |
| tree | 79a8ed1be4c95d1bd43112da1ecc1fd76ed92f0b /src/tools/qdoc/doc | |
| parent | 33ea784aa83f7c325707c7c4cc4c20303c28d1c7 (diff) | |
Rename all occurences of qdoc3 to qdoc in the qdoc manual.
Change-Id: I84cfab5a7130aff9ed8a6eb568d78f29167e1ac8
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src/tools/qdoc/doc')
| -rw-r--r-- | src/tools/qdoc/doc/config/qdoc-project.qdocconf | 4 | ||||
| -rw-r--r-- | src/tools/qdoc/doc/qdoc-guide.qdoc | 2 | ||||
| -rw-r--r-- | src/tools/qdoc/doc/qdoc-manual.qdoc | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/tools/qdoc/doc/config/qdoc-project.qdocconf b/src/tools/qdoc/doc/config/qdoc-project.qdocconf index d85058cd6a..2ac9107f38 100644 --- a/src/tools/qdoc/doc/config/qdoc-project.qdocconf +++ b/src/tools/qdoc/doc/config/qdoc-project.qdocconf @@ -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 diff --git a/src/tools/qdoc/doc/qdoc-guide.qdoc b/src/tools/qdoc/doc/qdoc-guide.qdoc index c3b37822fb..33cc5c67fd 100644 --- a/src/tools/qdoc/doc/qdoc-guide.qdoc +++ b/src/tools/qdoc/doc/qdoc-guide.qdoc @@ -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 diff --git a/src/tools/qdoc/doc/qdoc-manual.qdoc b/src/tools/qdoc/doc/qdoc-manual.qdoc index 3e67579f2a..2c51c09914 100644 --- a/src/tools/qdoc/doc/qdoc-manual.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual.qdoc @@ -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 |