From 7b16ab246d5c8241f08c0ffa3a87c9803ec4aa50 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 2 Sep 2020 15:43:52 +0200 Subject: Replace hand-rolled doc targets with ones provided by Qt This helps to provide correct include paths to QDoc as it requires them from 5.11 onwards. Add a custom module header that pulls in the required header files into the doc build. Change-Id: I857ec5cd49e6c6c586baed6f1e39f2e9ceb900b4 Reviewed-by: Katja Marttila Reviewed-by: Leena Miettinen --- doc/doc.pri | 57 --------------------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 doc/doc.pri (limited to 'doc/doc.pri') diff --git a/doc/doc.pri b/doc/doc.pri deleted file mode 100644 index a11a39b53..000000000 --- a/doc/doc.pri +++ /dev/null @@ -1,57 +0,0 @@ -# Adapted from doc/doc.pri in Qt Creator. - -QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc -win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") - -IFW_VERSION_TAG = $$replace(IFW_VERSION_STR, "[-.]", ) - -defineReplace(cmdEnv) { - !equals(QMAKE_DIR_SEP, /): 1 ~= s,^(.*)$,(set \\1) &&,g - return("$$1") -} - -QDOC = $$cmdEnv(SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html IFW_VERSION=$$IFW_VERSION_STR IFW_VERSION_TAG=$$IFW_VERSION_TAG QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]) $$QDOC_BIN - -unix { - HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator -} else { - # Always run qhelpgenerator inside its own cmd; this is a workaround for - # an unusual bug which causes qhelpgenerator.exe to do nothing - HELPGENERATOR = cmd /C $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\") -} -HELPGENERATOR = $$HELPGENERATOR -platform minimal - -QHP_FILE = $$OUT_PWD/doc/html/ifw.qhp -QCH_FILE = $$OUT_PWD/doc/ifw.qch - -html_docs.commands = $$QDOC $$PWD/installerfw.qdocconf -html_docs.files = $$QHP_FILE - -html_docs_online.commands = $$QDOC $$PWD/installerfw-online.qdocconf -html_docs_online.files = $$QHP_FILE - -qch_docs.commands = $$HELPGENERATOR -o $$QCH_FILE $$QHP_FILE -qch_docs.depends += html_docs -qch_docs.files = $$QCH_FILE - -docs_online.depends = html_docs_online -QMAKE_EXTRA_TARGETS += html_docs_online docs_online - -macx { - DOC_DIR = "$${OUT_PWD}/bin/Ifw.app/Contents/Resources/doc" - cp_docs.commands = mkdir -p \"$${DOC_DIR}\" ; $${QMAKE_COPY} \"$${QCH_FILE}\" \"$${DOC_DIR}\" - cp_docs.depends += qch_docs - docs.depends = cp_docs - QMAKE_EXTRA_TARGETS += html_docs qch_docs cp_docs docs ht -} -!macx { - docs.depends = qch_docs - QMAKE_EXTRA_TARGETS += html_docs qch_docs docs -} - -OTHER_FILES = $$HELP_DEP_FILES - -fixnavi.commands = \ - cd $$replace(PWD, "/", $$QMAKE_DIR_SEP) && \ - perl fixnavi.pl installerfw.qdoc . -QMAKE_EXTRA_TARGETS += fixnavi -- cgit v1.2.3