diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-29 16:09:03 +1000 |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-29 16:09:03 +1000 |
commit | 562f05d87ee41b7b95f91eea44a4a966dbcde1b9 (patch) | |
tree | 6ded52d18d1920c3099ec25326e6afdcf8e2bc83 | |
parent | aa8865b37520cf591ae795895f4a38d5ad86c17a (diff) | |
download | qt4-tools-562f05d87ee41b7b95f91eea44a4a966dbcde1b9.tar.gz |
Assistant, Designer, Lingist and QMake manuals weren't generated.
qdoc3 warns when it doesn't find doc source files that are listed in the
.qdocconf file, but it doesn't error out. Thus the manuals haven't been
generated since the 4.6 doc reorganization, but the failure has been
silent.
Reviewed-by: Trust Me
-rw-r--r-- | tools/qdoc3/test/assistant.qdocconf | 2 | ||||
-rw-r--r-- | tools/qdoc3/test/designer.qdocconf | 2 | ||||
-rw-r--r-- | tools/qdoc3/test/linguist.qdocconf | 2 | ||||
-rw-r--r-- | tools/qdoc3/test/qmake.qdocconf | 2 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-api-only-with-xcode.qdocconf | 8 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-api-only.qdocconf | 8 |
6 files changed, 12 insertions, 12 deletions
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 9ee8965fea..4ddc94adb0 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -31,7 +31,7 @@ qhp.Assistant.subprojects.examples.sortPages = true language = Cpp -sources = $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \ +sources = $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc sources.fileextensions = "*.cpp *.qdoc" diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index 2a651846db..9d8bd238fa 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -31,7 +31,7 @@ qhp.Designer.subprojects.examples.sortPages = true language = Cpp -sources = $QT_SOURCE_TREE/doc/src/designer-manual.qdoc \ +sources = $QT_SOURCE_TREE/doc/src/development/designer-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/calculatorbuilder.qdoc \ $QT_SOURCE_TREE/doc/src/examples/calculatorform.qdoc \ $QT_SOURCE_TREE/doc/src/examples/customwidgetplugin.qdoc \ diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index 6c71993fdb..f433529a37 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -31,7 +31,7 @@ qhp.Linguist.subprojects.examples.sortPages = true language = Cpp -sources = $QT_SOURCE_TREE/doc/src/linguist-manual.qdoc \ +sources = $QT_SOURCE_TREE/doc/src/internationalization/linguist-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/hellotr.qdoc \ $QT_SOURCE_TREE/doc/src/examples/arrowpad.qdoc \ $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index 3dc1d3b43a..dcb3c9abbe 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -27,7 +27,7 @@ qhp.qmake.subprojects.manual.selectors = fake:page language = Cpp -sources = $QT_SOURCE_TREE/doc/src/qmake-manual.qdoc +sources = $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc sources.fileextensions = "*.cpp *.qdoc" diff --git a/tools/qdoc3/test/qt-api-only-with-xcode.qdocconf b/tools/qdoc3/test/qt-api-only-with-xcode.qdocconf index 03893865f0..0d78cdacbe 100644 --- a/tools/qdoc3/test/qt-api-only-with-xcode.qdocconf +++ b/tools/qdoc3/test/qt-api-only-with-xcode.qdocconf @@ -9,9 +9,9 @@ url = ./ # Ensures that the documentation for the tools is not included in the generated # .qhp file. -qhp.Qt.excluded = $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \ +qhp.Qt.excluded = $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc \ - $QT_SOURCE_TREE/doc/src/designer-manual.qdoc \ + $QT_SOURCE_TREE/doc/src/development/designer-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/calculatorbuilder.qdoc \ $QT_SOURCE_TREE/doc/src/examples/calculatorform.qdoc \ $QT_SOURCE_TREE/doc/src/examples/customwidgetplugin.qdoc \ @@ -19,11 +19,11 @@ qhp.Qt.excluded = $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/containerextension.qdoc \ $QT_SOURCE_TREE/doc/src/examples/worldtimeclockbuilder.qdoc \ $QT_SOURCE_TREE/doc/src/examples/worldtimeclockplugin.qdoc \ - $QT_SOURCE_TREE/doc/src/linguist-manual.qdoc \ + $QT_SOURCE_TREE/doc/src/internationalization/linguist-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/hellotr.qdoc \ $QT_SOURCE_TREE/doc/src/examples/arrowpad.qdoc \ $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \ - $QT_SOURCE_TREE/doc/src/qmake-manual.qdoc + $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc outputdir = $QT_BUILD_TREE/doc-build/html-qt base = file:$QT_BUILD_TREE/doc-build/html-qt diff --git a/tools/qdoc3/test/qt-api-only.qdocconf b/tools/qdoc3/test/qt-api-only.qdocconf index bc5656ba5a..10b7be507a 100644 --- a/tools/qdoc3/test/qt-api-only.qdocconf +++ b/tools/qdoc3/test/qt-api-only.qdocconf @@ -9,9 +9,9 @@ url = ./ # Ensures that the documentation for the tools is not included in the generated # .qhp file. -qhp.Qt.excluded += $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \ +qhp.Qt.excluded += $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc \ - $QT_SOURCE_TREE/doc/src/designer-manual.qdoc \ + $QT_SOURCE_TREE/doc/src/development/designer-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/calculatorbuilder.qdoc \ $QT_SOURCE_TREE/doc/src/examples/calculatorform.qdoc \ $QT_SOURCE_TREE/doc/src/examples/customwidgetplugin.qdoc \ @@ -19,11 +19,11 @@ qhp.Qt.excluded += $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/containerextension.qdoc \ $QT_SOURCE_TREE/doc/src/examples/worldtimeclockbuilder.qdoc \ $QT_SOURCE_TREE/doc/src/examples/worldtimeclockplugin.qdoc \ - $QT_SOURCE_TREE/doc/src/linguist-manual.qdoc \ + $QT_SOURCE_TREE/doc/src/internationalization/linguist-manual.qdoc \ $QT_SOURCE_TREE/doc/src/examples/hellotr.qdoc \ $QT_SOURCE_TREE/doc/src/examples/arrowpad.qdoc \ $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \ - $QT_SOURCE_TREE/doc/src/qmake-manual.qdoc + $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc outputdir = $QT_BUILD_TREE/doc-build/html-qt tagfile = $QT_BUILD_TREE/doc-build/html-qt/qt.tags |