diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-11 15:01:24 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-01-08 09:36:30 +0000 |
| commit | 09c92863001790a0304a5ef389901ee2b5b6cdc2 (patch) | |
| tree | 089db9cd2d559a0d8425423bf9e23d78040359c7 /mkspecs | |
| parent | d3518b752583d6d725f4adb14f804ae6d7cfa650 (diff) | |
fix doc builds in paths with spaces
Change-Id: Ie76411e3a4a8df69ff9b12a18480d1a987fac639
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_docs.prf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf index 15bd12072a..37b2f06193 100644 --- a/mkspecs/features/qt_docs.prf +++ b/mkspecs/features/qt_docs.prf @@ -31,9 +31,9 @@ qtdocs.value = $$[QT_INSTALL_DOCS/src] QT_TOOL_ENV = qtver qtmver qtvertag qtdocs qtPrepareTool(QDOC, qdoc) QT_TOOL_ENV = -QDOC += -outputdir $$QMAKE_DOCS_OUTPUTDIR +QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) !build_online_docs: \ - QDOC += -installdir $$[QT_INSTALL_DOCS] + QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) PREP_DOC_INDEXES = DOC_INDEXES = !isEmpty(QTREPOS) { @@ -46,14 +46,14 @@ DOC_INDEXES = mps += $$dirname(QT.$${d}.libs) mps = $$unique(mps) for (mp, mps): \ - PREP_DOC_INDEXES += -indexdir $$mp/doc + PREP_DOC_INDEXES += -indexdir $$shell_quote($$mp/doc) } for(qrep, QTREPOS): \ - DOC_INDEXES += -indexdir $$qrep/doc + DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) } else { prepare_docs: \ - PREP_DOC_INDEXES += -indexdir $$[QT_INSTALL_DOCS/get] - DOC_INDEXES += -indexdir $$[QT_INSTALL_DOCS/get] + PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) + DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) } doc_command = $$QDOC $$QMAKE_DOCS prepare_docs { @@ -65,7 +65,7 @@ prepare_docs { !build_online_docs { 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.path = $$[QT_INSTALL_DOCS] |