From c04cf29b78f3f5747c58dd89ca21523e387ee3ac Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 8 Jan 2016 17:06:43 +0100
Subject: fix docs creation in debug_and_release builds

qtAddToolEnv() (via qtPrepareTool()) does not write the tool wrapper
scripts during build passes, while qt_docs.prf (which calls it for qdoc
and qhelpgenerator) was loaded only during build passes. the consequence
was that the makefiles tried calling non-existent scripts.

amends 5418d77a1, sort of.

Change-Id: I64ab573495ca339be4c7b5e8c6848b298b6cb605
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 mkspecs/features/qt_docs.prf         | 23 +++++++++++++++--------
 mkspecs/features/qt_docs_targets.prf | 20 ++++++++++----------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index 37b2f06193..183d0c9502 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -11,13 +11,6 @@
 
 !exists($$QMAKE_DOCS): error("Cannot find documentation specification file $$QMAKE_DOCS")
 
-load(qt_build_paths)
-QMAKE_DOCS_BASE_OUTDIR = $$MODULE_BASE_OUTDIR/doc
-
-QMAKE_DOCS_TARGET = $$replace(QMAKE_DOCS, ^(.*/)?(.*)\\.qdocconf$, \\2)
-isEmpty(QMAKE_DOCS_TARGETDIR): QMAKE_DOCS_TARGETDIR = $$QMAKE_DOCS_TARGET
-QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
-
 qtver.name = QT_VERSION
 qtver.value = $$VERSION
 isEmpty(qtver.value): qtver.value = $$MODULE_VERSION
@@ -31,6 +24,21 @@ qtdocs.value = $$[QT_INSTALL_DOCS/src]
 QT_TOOL_ENV = qtver qtmver qtvertag qtdocs
 qtPrepareTool(QDOC, qdoc)
 QT_TOOL_ENV =
+
+!build_online_docs: qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
+
+# qtPrepareTool() must be called outside a build pass, as it protects
+# against concurrent wrapper creation by omitting it during build passes.
+# However, creating the actual targets is reserved to the build passes.
+debug_and_release:!build_pass: return()
+
+load(qt_build_paths)
+QMAKE_DOCS_BASE_OUTDIR = $$MODULE_BASE_OUTDIR/doc
+
+QMAKE_DOCS_TARGET = $$replace(QMAKE_DOCS, ^(.*/)?(.*)\\.qdocconf$, \\2)
+isEmpty(QMAKE_DOCS_TARGETDIR): QMAKE_DOCS_TARGETDIR = $$QMAKE_DOCS_TARGET
+QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
+
 QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR)
 !build_online_docs: \
     QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS])
@@ -64,7 +72,6 @@ prepare_docs {
 }
 
 !build_online_docs {
-    qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
     qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch)
 
     inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR
diff --git a/mkspecs/features/qt_docs_targets.prf b/mkspecs/features/qt_docs_targets.prf
index 89f080cc5e..1f9e2b0b47 100644
--- a/mkspecs/features/qt_docs_targets.prf
+++ b/mkspecs/features/qt_docs_targets.prf
@@ -29,17 +29,17 @@ QMAKE_EXTRA_TARGETS += docs
 contains(TEMPLATE, subdirs) {
     for(inst, DOC_TARGETS): \
         prepareRecursiveTarget($$inst)
-} else:debug_and_release:!build_pass {
-    sub = $$first(BUILDS)
-    for(inst, DOC_TARGETS) {
-        $${inst}.CONFIG = recursive
-        $${inst}.recurse = $$sub
-    }
 } else {
-    # apps and libs only generate docs if QMAKE_DOCS is set
-    !isEmpty(QMAKE_DOCS) {
-        # backwards compat hack
-        load(qt_docs)
+    debug_and_release:!build_pass {
+        sub = $$first(BUILDS)
+        for(inst, DOC_TARGETS) {
+            $${inst}.CONFIG = recursive
+            $${inst}.recurse = $$sub
+        }
     }
+    # Apps and libs request docs creation by setting QMAKE_DOCS.
+    # This is a backwards compat hack - technically, the modules which need it
+    # are supposed to load(qt_docs) themselves.
+    !isEmpty(QMAKE_DOCS): load(qt_docs)
 }
 QMAKE_EXTRA_TARGETS += $$DOC_TARGETS
-- 
cgit v1.2.3