diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-05 15:42:39 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-08 17:36:45 +0200 |
| commit | 23e8fa55b467b298b97b289e0124329c8e758c47 (patch) | |
| tree | 336de57ad5fcb2012f0c18d20f170a921bc2d958 /mkspecs/features/qt_docs.prf | |
| parent | 6d5ab1d305616cac513e06e7eef248e04f4257e2 (diff) | |
don't pass -indexdir during prepare_docs phase
the forward-referenced directories don't exist yet, so we get pointless
warnings. in fact, this is why we do a multi-pass build in the first
place, and consequently using indexes during the first pass is
illogical.
Task-number: QTBUG-32152
Change-Id: I66bf6b43238827e87cb8bf6932d581b808c1032d
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'mkspecs/features/qt_docs.prf')
| -rw-r--r-- | mkspecs/features/qt_docs.prf | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf index 5b42cfcac8..85e2db25bc 100644 --- a/mkspecs/features/qt_docs.prf +++ b/mkspecs/features/qt_docs.prf @@ -19,11 +19,12 @@ isEmpty(QMAKE_DOCS_TARGETDIR): QMAKE_DOCS_TARGETDIR = $$QMAKE_DOCS_TARGET QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR qtPrepareTool(QDOC, qdoc) -for(qmod, QMAKEMODULES): \ - QDOC += -indexdir $$section(qmod, /, 0, -3)/doc QDOC += -outputdir $$QMAKE_DOCS_OUTPUTDIR !build_online_docs: \ QDOC += -installdir $$[QT_INSTALL_DOCS] +DOC_INDEXES = +for(qmod, QMAKEMODULES): \ + DOC_INDEXES += -indexdir $$section(qmod, /, 0, -3)/doc qtver.name = QT_VERSION qtver.value = $$VERSION isEmpty(qtver.value): qtver.value = $$MODULE_VERSION @@ -38,9 +39,9 @@ qtAddToolEnv(QDOC, qtver qtmver qtvertag qtdocs) doc_command = $$QDOC $$QMAKE_DOCS prepare_docs { prepare_docs.commands += $$doc_command -prepare -no-link-errors - generate_docs.commands += $$doc_command -generate + generate_docs.commands += $$doc_command -generate $$DOC_INDEXES } else { - html_docs.commands += $$doc_command + html_docs.commands += $$doc_command $$DOC_INDEXES } !build_online_docs { |