summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-10-22 12:17:19 +0200
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-10-25 12:19:17 +0200
commit600f2397b8d3d336b5d6faf8b49815641fe6f523 (patch)
treed94c73685ee8a93869311f09e75a9c3b34d3fc73 /tools
parentdb97d35557a1c9181d39ee60c91c44463f5e088d (diff)
Add config option to build documentation as a two-step process
The new 'prepare_docs' CONFIG option triggers the documentation rules in default_post to generate two extra targets: prepare_docs and generate_docs. The prepare_docs stage runs qdoc with the -prepare option, which means qdoc will only generate index files, and the generate_docs stage will call qdoc with -generate, which reads the index files and generates the final output. The regular docs target will then run the prepare_docs target for all submodules before running the generate_docs target. This ensures that when generating the final output, qdoc has all the index files for all the other modules available, to be able to resolve cross-references between the various Qt modules. This patch needs a follow-up in qt5.git to add CONFIG+=prepare_docs, so that the root Qt5 build will be able to hook into this new behavior. Change-Id: I654d7f0d4d5a41d9be208e6d3a8923bf0194f9ad Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 0d4d6d4ec9..58f7a9b511 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2724,7 +2724,7 @@ void Configure::generateCachefile()
if (!dictionary["DECORATIONS"].isEmpty())
moduleStream << "decorations += "<<dictionary["DECORATIONS"]<<endl;
- moduleStream << "CONFIG += create_prl link_prl";
+ moduleStream << "CONFIG += create_prl link_prl prepare_docs";
if (dictionary[ "SSE2" ] == "yes")
moduleStream << " sse2";
if (dictionary[ "SSE3" ] == "yes")