path: root/src
diff options
authorTor Arne Vestbø <>2012-10-22 12:17:19 +0200
committerTor Arne Vestbø <>2012-10-25 12:19:17 +0200
commit600f2397b8d3d336b5d6faf8b49815641fe6f523 (patch)
treed94c73685ee8a93869311f09e75a9c3b34d3fc73 /src
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 <>
Diffstat (limited to 'src')
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/ b/src/tools/
index c67d6bfd76..f7d1e651ff 100644
--- a/src/tools/
+++ b/src/tools/
@@ -38,6 +38,6 @@ SUBDIRS = $$TOOLS_SUBDIRS
# Ensure qdoc is built before making any docs. We rely on the existing dependency
# on bootstrap for each of the other tools to ensure they also build qdoc first,
# and likewise, the dependency of the rest of the build on tools, src, etc.
-bootstrap_docs.depends += $${}-make_first = $${}-docs
-QMAKE_EXTRA_TARGETS += bootstrap_docs
+bootstrap_prepare_docs.depends += $${}-make_first = $${}-prepare_docs
+QMAKE_EXTRA_TARGETS += bootstrap_prepare_docs