From ef470a1d10c619f28614140d71e694253e8e6b47 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 10 Mar 2017 11:54:41 +0100 Subject: [PATCH] Add documentation sub-targets To make it possible to build individual documentation sets with targets html_docs_ and qch_docs_. Keep using the && chained commands for the (html|qch)_docs targets though, because we had issues with parallel documentation creation before. Change-Id: I80556bfaddb79aec3da3e09e4d4843b5d33be451 Reviewed-by: Leena Miettinen --- docs.pri | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs.pri b/docs.pri index 68c6d414500..4c125724a3f 100644 --- a/docs.pri +++ b/docs.pri @@ -28,12 +28,19 @@ for (qtc_doc, QTC_DOCS) { QTC_DOCS_TARGETDIR = $$QTC_DOCS_TARGET QTC_DOCS_OUTPUTDIR = $$QTC_DOCS_BASE_OUTDIR/$$QTC_DOCS_TARGETDIR + html_docs_$${QTC_DOCS_TARGET}.commands = $$QDOC -outputdir $$shell_quote($$QTC_DOCS_OUTPUTDIR) $$qtc_doc $$DOC_INDEXES + QMAKE_EXTRA_TARGETS += html_docs_$${QTC_DOCS_TARGET} + !isEmpty(html_docs.commands): html_docs.commands += && - html_docs.commands += $$QDOC -outputdir $$shell_quote($$QTC_DOCS_OUTPUTDIR) $$qtc_doc $$DOC_INDEXES + html_docs.commands += $$eval(html_docs_$${QTC_DOCS_TARGET}.commands) !build_online_docs { + qch_docs_$${QTC_DOCS_TARGET}.commands = $$QHELPGENERATOR $$shell_quote($$QTC_DOCS_OUTPUTDIR/$${QTC_DOCS_TARGET}.qhp) -o $$shell_quote($$IDE_DOC_PATH/$${QTC_DOCS_TARGET}.qch) + qch_docs_$${QTC_DOCS_TARGET}.depends = html_docs_$${QTC_DOCS_TARGET} + QMAKE_EXTRA_TARGETS += qch_docs_$${QTC_DOCS_TARGET} + !isEmpty(qch_docs.commands): qch_docs.commands += && - qch_docs.commands += $$QHELPGENERATOR $$shell_quote($$QTC_DOCS_OUTPUTDIR/$${QTC_DOCS_TARGET}.qhp) -o $$shell_quote($$IDE_DOC_PATH/$${QTC_DOCS_TARGET}.qch) + qch_docs.commands += $$eval(qch_docs_$${QTC_DOCS_TARGET}.commands) inst_qch_docs.files += $$IDE_DOC_PATH/$${QTC_DOCS_TARGET}.qch }