Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id96d4076610366a7cc66c8d8382ca25c33eaa71d

3 files changed, 8 insertions, 18 deletions

diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 8b28b09e00..4819dbdd07 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -25,6 +25,7 @@ MODULE_DEFINES = \
 
 DEFINES += \
     $$MODULE_DEFINES \
+    QT_CRYPTOGRAPHICHASH_ONLY_SHA1 \
     QT_NO_CAST_FROM_ASCII
 
 MODULE_PRIVATE_INCLUDES = \
@@ -84,6 +85,7 @@ SOURCES += \
            ../../corelib/tools/qbytearray.cpp \
            ../../corelib/tools/qarraydata.cpp \
            ../../corelib/tools/qbytearraymatcher.cpp \
+           ../../corelib/tools/qcryptographichash.cpp \
            ../../corelib/tools/qdatetime.cpp \
            ../../corelib/tools/qhash.cpp \
            ../../corelib/tools/qlist.cpp \
diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp
index 6c8b947c46..9c2dd4dcfc 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.
@@ -321,7 +309,7 @@ static void processQdocconfFile(const QString &fileName)
       Load the language translators, if the configuration specifies any.
      */
     QStringList fileNames = config.getStringList(CONFIG_TRANSLATORS);
-    QStringList::Iterator fn = fileNames.constBegin();
+    QStringList::ConstIterator fn = fileNames.constBegin();
     while (fn != fileNames.constEnd()) {
         QTranslator *translator = new QTranslator(0);
         if (!translator->load(*fn))
diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
index 7664fa4f4d..3bd11bcd5b 100644
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -1,8 +1,9 @@
 option(host_build)
-CONFIG += force_bootstrap   # because of weird QLibraryInfo::location() reference
+QT = core xml
 
-DEFINES += QDOC2_COMPAT \
-           QT_CRYPTOGRAPHICHASH_ONLY_SHA1
+DEFINES += \
+    QT_QMLDEVTOOLS_LIB \   # force static exports even if not bootstrapping
+    QDOC2_COMPAT
 
 INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \
                $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser
@@ -66,8 +67,7 @@ SOURCES += atom.cpp \
            text.cpp \
            tokenizer.cpp \
            tree.cpp \
-           yyindent.cpp \
-           ../../corelib/tools/qcryptographichash.cpp
+           yyindent.cpp
 
 ### QML/JS Parser ###