1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix doc builds in paths with spaces

Browse Source 
Change-Id: Ie76411e3a4a8df69ff9b12a18480d1a987fac639
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-12-11 15:01:24 +01:00 committed by Frederik Gladhorn
parent d3518b7525
commit 09c9286300
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mkspecs/features/qt_docs.prf
View File

@ -31,9 +31,9 @@ qtdocs.value = $$[QT_INSTALL_DOCS/src]
QT_TOOL_ENV = qtver qtmver qtvertag qtdocs QT_TOOL_ENV = qtver qtmver qtvertag qtdocs
qtPrepareTool(QDOC, qdoc) qtPrepareTool(QDOC, qdoc)
QT_TOOL_ENV = QT_TOOL_ENV =
QDOC += -outputdir $$QMAKE_DOCS_OUTPUTDIR QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR)
!build_online_docs: \ !build_online_docs: \
QDOC += -installdir $$[QT_INSTALL_DOCS] QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS])
PREP_DOC_INDEXES = PREP_DOC_INDEXES =
DOC_INDEXES = DOC_INDEXES =
!isEmpty(QTREPOS) { !isEmpty(QTREPOS) {
@ -46,14 +46,14 @@ DOC_INDEXES =
mps += $$dirname(QT.$${d}.libs) mps += $$dirname(QT.$${d}.libs)
mps = $$unique(mps) mps = $$unique(mps)
for (mp, mps): \ for (mp, mps): \
PREP_DOC_INDEXES += -indexdir $$mp/doc PREP_DOC_INDEXES += -indexdir $$shell_quote($$mp/doc)
} }
for(qrep, QTREPOS): \ for(qrep, QTREPOS): \
DOC_INDEXES += -indexdir $$qrep/doc DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc)
} else { } else {
prepare_docs: \ prepare_docs: \
PREP_DOC_INDEXES += -indexdir $$[QT_INSTALL_DOCS/get] PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])
DOC_INDEXES += -indexdir $$[QT_INSTALL_DOCS/get] DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])
} }
doc_command = $$QDOC $$QMAKE_DOCS doc_command = $$QDOC $$QMAKE_DOCS
prepare_docs { prepare_docs {
@ -65,7 +65,7 @@ prepare_docs {
!build_online_docs { !build_online_docs {
qtPrepareTool(QHELPGENERATOR, qhelpgenerator) qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
qch_docs.commands = $$QHELPGENERATOR $$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp -o $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch 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 inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR
inst_html_docs.path = $$[QT_INSTALL_DOCS] inst_html_docs.path = $$[QT_INSTALL_DOCS]