From 600f2397b8d3d336b5d6faf8b49815641fe6f523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 22 Oct 2012 12:17:19 +0200 Subject: 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 --- src/tools/tools.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tools/tools.pro') diff --git a/src/tools/tools.pro b/src/tools/tools.pro index c67d6bfd76..f7d1e651ff 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -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 += $${src_tools_qdoc.target}-make_first -bootstrap_docs.target = $${src_tools_bootstrap.target}-docs -QMAKE_EXTRA_TARGETS += bootstrap_docs +bootstrap_prepare_docs.depends += $${src_tools_qdoc.target}-make_first +bootstrap_prepare_docs.target = $${src_tools_bootstrap.target}-prepare_docs +QMAKE_EXTRA_TARGETS += bootstrap_prepare_docs -- cgit v1.2.3