From 779516957a36da318c153674415b7897cd122988 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 15 Mar 2013 17:22:31 +0100 Subject: move the setup of QT_INSTALL_DOCS from qdoc to qt_docs.prf this is a qt specific option and really should not be hard-coded. also, the implementation used undocumented api that is internal to the bootstrapped process, which made it impossible to de-bootstrap it. Change-Id: If706960671744e64a9a7c366437977a800a6058e Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_docs.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf index c80efb03e0..5b42cfcac8 100644 --- a/mkspecs/features/qt_docs.prf +++ b/mkspecs/features/qt_docs.prf @@ -32,7 +32,9 @@ qtmver.name = QT_VER qtmver.value = $$replace(qtver.value, ^(\\d+\\.\\d+).*$, \\1) qtvertag.name = QT_VERSION_TAG qtvertag.value = $$replace(qtver.value, \.,) -qtAddToolEnv(QDOC, qtver qtmver qtvertag) +qtdocs.name = QT_INSTALL_DOCS +qtdocs.value = $$[QT_INSTALL_DOCS/get] +qtAddToolEnv(QDOC, qtver qtmver qtvertag qtdocs) doc_command = $$QDOC $$QMAKE_DOCS prepare_docs { prepare_docs.commands += $$doc_command -prepare -no-link-errors -- cgit v1.2.3