1 files changed, 41 insertions, 33 deletions
diff --git a/mkspecs/features/qt_docs_targets.prf b/mkspecs/features/qt_docs_targets.prf
index 0d9f90bce2..89f080cc5e 100644
--- a/mkspecs/features/qt_docs_targets.prf
+++ b/mkspecs/features/qt_docs_targets.prf
@@ -1,37 +1,45 @@
-!contains(QMAKE_EXTRA_TARGETS, docs) {
-    contains(TEMPLATE, subdirs) {
-        prepare_docs {
-            prepareRecursiveTarget(prepare_docs)
-            prepareRecursiveTarget(generate_docs)
-            html_docs.commands = $(MAKE) -f $(MAKEFILE) prepare_docs && $(MAKE) -f $(MAKEFILE) generate_docs
-        } else {
-            prepareRecursiveTarget(html_docs)
-        }
-        prepareRecursiveTarget(qch_docs)
-        prepareRecursiveTarget(docs)
-    } else {
-        # apps and libs only generate docs if QMAKE_DOCS is set
-        !isEmpty(QMAKE_DOCS) {
-            # backwards compat hack
-            load(qt_docs)
-        }
-    }
-    docs.commands = $(MAKE) -f $(MAKEFILE) html_docs && $(MAKE) -f $(MAKEFILE) qch_docs
-    QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
-    prepare_docs: QMAKE_EXTRA_TARGETS += prepare_docs generate_docs
+#
+#  W A R N I N G
+#  -------------
+#
+# This file is not part of the Qt API.  It exists purely as an
+# implementation detail.  It may change from version to version
+# without notice, or even be removed.
+#
+# We mean it.
+#
+
+DOC_TARGETS = \
+    install_html_docs uninstall_html_docs \
+    install_qch_docs uninstall_qch_docs \
+    install_docs uninstall_docs \
+    qch_docs
+
+prepare_docs {
+    DOC_TARGETS += prepare_docs generate_docs
+    html_docs.commands = $(MAKE) -f $(MAKEFILE) prepare_docs && $(MAKE) -f $(MAKEFILE) generate_docs
+    QMAKE_EXTRA_TARGETS += html_docs
+} else {
+    DOC_TARGETS += html_docs
 }
 
-!contains(QMAKE_EXTRA_TARGETS, install_docs) {
-    contains(TEMPLATE, subdirs) {
-        prepareRecursiveTarget(install_html_docs)
-        prepareRecursiveTarget(uninstall_html_docs)
-        prepareRecursiveTarget(install_qch_docs)
-        prepareRecursiveTarget(uninstall_qch_docs)
-        prepareRecursiveTarget(install_docs)
-        prepareRecursiveTarget(uninstall_docs)
+docs.commands = $(MAKE) -f $(MAKEFILE) html_docs && $(MAKE) -f $(MAKEFILE) qch_docs
+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)
     }
-    QMAKE_EXTRA_TARGETS += \
-        install_html_docs uninstall_html_docs \
-        install_qch_docs uninstall_qch_docs \
-        install_docs uninstall_docs
 }
+QMAKE_EXTRA_TARGETS += $$DOC_TARGETS