From 2e284a8d7ec5b8d52508b549cff2b988ade34e30 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 23 May 2014 18:05:05 +0200
Subject: pass (some) index dirs also during -prepare phase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

qdoc uses the indexes as "precompiled headers" to obtain type info
necessary to properly parse sources.
the indexes needed are the ones the module actually depends on
(publically).

Change-Id: I6aad0b511d2534d584f7947c8d800300eede94ff
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
---
 mkspecs/features/qt_docs.prf | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index 957b5de83a..bcc16ada78 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -22,11 +22,25 @@ qtPrepareTool(QDOC, qdoc)
 QDOC += -outputdir $$QMAKE_DOCS_OUTPUTDIR
 !build_online_docs: \
     QDOC += -installdir $$[QT_INSTALL_DOCS]
+PREP_DOC_INDEXES =
 DOC_INDEXES =
 !isEmpty(QTREPOS) {
+    prepare_docs {
+        # This is not for linking, but for providing type information.
+        mps =
+        deps = $$replace(QT, -private$, )
+        deps = $$resolve_depends(deps, "QT.")
+        for (d, deps): \
+            mps += $$dirname(QT.$${d}.libs)
+        mps = $$unique(mps)
+        for (mp, mps): \
+            PREP_DOC_INDEXES += -indexdir $$mp/doc
+    }
     for(qrep, QTREPOS): \
         DOC_INDEXES += -indexdir $$qrep/doc
 } else {
+    prepare_docs: \
+        PREP_DOC_INDEXES += -indexdir $$[QT_INSTALL_DOCS/get]
     DOC_INDEXES += -indexdir $$[QT_INSTALL_DOCS/get]
 }
 qtver.name = QT_VERSION
@@ -42,7 +56,7 @@ qtdocs.value = $$[QT_INSTALL_DOCS/src]
 qtAddToolEnv(QDOC, qtver qtmver qtvertag qtdocs)
 doc_command = $$QDOC $$QMAKE_DOCS
 prepare_docs {
-    prepare_docs.commands += $$doc_command -prepare -no-link-errors
+    prepare_docs.commands += $$doc_command -prepare $$PREP_DOC_INDEXES -no-link-errors
     generate_docs.commands += $$doc_command -generate $$DOC_INDEXES
 } else {
     html_docs.commands += $$doc_command $$DOC_INDEXES
-- 
cgit v1.2.3