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 --- src/tools/qdoc/main.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src') diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index 6c8b947c46..bf835db807 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include -#include #include #include "codemarker.h" #include "codeparser.h" @@ -261,17 +260,6 @@ static void processQdocconfFile(const QString &fileName) config.setStringList(CONFIG_NOLINKERRORS, QStringList(noLinkErrors ? "true" : "false")); config.setStringList(CONFIG_OBSOLETELINKS, QStringList(obsoleteLinks ? "true" : "false")); - /* - If QT_INSTALL_DOCS is not set, set it here so it can be used from - the qdocconf files. - */ - QString qt_install_docs = qgetenv("QT_INSTALL_DOCS"); - if (qt_install_docs.isEmpty()) { - documentationPath = QLibraryInfo::rawLocation(QLibraryInfo::DocumentationPath, - QLibraryInfo::EffectivePaths); - qputenv("QT_INSTALL_DOCS", documentationPath.toLatin1()); - } - /* With the default configuration values in place, load the qdoc configuration file. Note that the configuration -- cgit v1.2.3