diff options
| -rw-r--r-- | mkspecs/features/qt_docs.prf | 4 | ||||
| -rw-r--r-- | src/tools/qdoc/main.cpp | 12 |
2 files changed, 3 insertions, 13 deletions
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 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 <qglobal.h> -#include <qlibraryinfo.h> #include <stdlib.h> #include "codemarker.h" #include "codeparser.h" @@ -262,17 +261,6 @@ static void processQdocconfFile(const QString &fileName) 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 file may include other configuration files. |