path: root/configure
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 /configure
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 'configure')
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 78ae73c2d4..3b39b80d2e 100755
--- a/configure
+++ b/configure
@@ -6048,7 +6048,7 @@ fi
-echo "CONFIG += $QMAKE_CONFIG create_prl link_prl" >> "$QTMODULE.tmp"
+echo "CONFIG += $QMAKE_CONFIG create_prl link_prl prepare_docs" >> "$QTMODULE.tmp"
if [ -n "$QT_CFLAGS_PSQL" ]; then