diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-05-21 14:22:31 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-05 17:11:31 +0200 |
commit | a763500a61de7c25b73d6eb54a7d8ca60af0d79e (patch) | |
tree | 32eda4849679a34fcede38218520e614d6aa5591 | |
parent | 020c54daaaee6a0e4ce7de9bdf57b3ca4e8965b1 (diff) |
ensure that there is always an -indexdir argument
even if we are not doing a top-level build, we still need to specify an
index dir. that may be the install dir or the qtbase build dir,
depending on whether we are building against an installed prefix build
or a non-prefix build (building against non-installed prefix builds
outside a top-level build is inherently impossible).
Task-number: QTBUG-35596
Change-Id: Ia37d429855480d3bfe36b7ee29e087029861bfc5
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r-- | mkspecs/features/qt_docs.prf | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf index 8e63fa61a7..495b649b4a 100644 --- a/mkspecs/features/qt_docs.prf +++ b/mkspecs/features/qt_docs.prf @@ -23,9 +23,13 @@ QDOC += -outputdir $$QMAKE_DOCS_OUTPUTDIR !build_online_docs: \ QDOC += -installdir $$[QT_INSTALL_DOCS] DOC_INDEXES = -for(qrep, QTREPOS): \ - exists($$qrep/doc): \ - DOC_INDEXES += -indexdir $$qrep/doc +!isEmpty(QTREPOS) { + for(qrep, QTREPOS): \ + exists($$qrep/doc): \ + DOC_INDEXES += -indexdir $$qrep/doc +} else { + DOC_INDEXES += -indexdir $$[QT_INSTALL_DOCS/get] +} qtver.name = QT_VERSION qtver.value = $$VERSION isEmpty(qtver.value): qtver.value = $$MODULE_VERSION |