use qt's qdoc templates when building against qt5

Change-Id: Id49e7808b0e8e83c54d573766fcb8c25bfe6728b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

9 files changed, 13 insertions, 11 deletions

diff --git a/doc/api/qtcreator-dev-online-qt4.qdocconf b/doc/api/qtcreator-dev-online-qt4.qdocconf
index 0bd7edcb2a..3ba96b7aad 100644
--- a/doc/api/qtcreator-dev-online-qt4.qdocconf
+++ b/doc/api/qtcreator-dev-online-qt4.qdocconf
@@ -1,4 +1,4 @@
 # Run qdoc from the directory that contains this file.
 include(../config/compat.qdocconf)
-include(qtcreator-dev-online.qdocconf)
-
+include(../config/qtcreator-developer.qdocconf)
+include(../config/qt-html-templates-online.qdocconf)
diff --git a/doc/api/qtcreator-dev-online.qdocconf b/doc/api/qtcreator-dev-online.qdocconf
index e281673199..bf7d6c02b4 100644
--- a/doc/api/qtcreator-dev-online.qdocconf
+++ b/doc/api/qtcreator-dev-online.qdocconf
@@ -1,4 +1,4 @@
 # Run qdoc from the directory that contains this file.
 include(../config/qtcreator-developer.qdocconf)
-include(../config/qt-html-templates-online.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf)
 
diff --git a/doc/api/qtcreator-dev-qt4.qdocconf b/doc/api/qtcreator-dev-qt4.qdocconf
index 55cc6987f9..8a3201ca20 100644
--- a/doc/api/qtcreator-dev-qt4.qdocconf
+++ b/doc/api/qtcreator-dev-qt4.qdocconf
@@ -1,3 +1,4 @@
 # Run qdoc from the directory that contains this file.
 include(../config/compat.qdocconf)
-include(qtcreator-dev.qdocconf)
+include(../config/qtcreator-developer.qdocconf)
+include(../config/qt-html-templates.qdocconf)
diff --git a/doc/api/qtcreator-dev.qdocconf b/doc/api/qtcreator-dev.qdocconf
index 0989e7ae75..016bd6450f 100644
--- a/doc/api/qtcreator-dev.qdocconf
+++ b/doc/api/qtcreator-dev.qdocconf
@@ -1,3 +1,3 @@
 # Run qdoc from the directory that contains this file.
 include(../config/qtcreator-developer.qdocconf)
-include(../config/qt-html-templates.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
diff --git a/doc/doc.pri b/doc/doc.pri
index d70ceb8f8b..4ab4f4a232 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -21,7 +21,7 @@ defineReplace(cmdEnv) {
 }
 
 defineReplace(qdoc) {
-    return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG) $$QDOC_BIN")
+    return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]) $$QDOC_BIN")
 }
 
 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
diff --git a/doc/qtcreator-online-qt4.qdocconf b/doc/qtcreator-online-qt4.qdocconf
index c0b201dae7..03c92f7e02 100644
--- a/doc/qtcreator-online-qt4.qdocconf
+++ b/doc/qtcreator-online-qt4.qdocconf
@@ -1,3 +1,4 @@
 # Run qdoc from the directory that contains this file.
 include(config/compat.qdocconf)
-include(qtcreator-online.qdocconf)
+include(config/qtcreator-project.qdocconf)
+include(config/qt-html-templates-online.qdocconf)
diff --git a/doc/qtcreator-online.qdocconf b/doc/qtcreator-online.qdocconf
index 9219bf9ced..e1ef0e1f08 100644
--- a/doc/qtcreator-online.qdocconf
+++ b/doc/qtcreator-online.qdocconf
@@ -1,4 +1,3 @@
 # Run qdoc from the directory that contains this file.
 include(config/qtcreator-project.qdocconf)
-include(config/qt-html-templates-online.qdocconf)
-
+include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf)
diff --git a/doc/qtcreator-qt4.qdocconf b/doc/qtcreator-qt4.qdocconf
index 7805ce924b..8354f88ecc 100644
--- a/doc/qtcreator-qt4.qdocconf
+++ b/doc/qtcreator-qt4.qdocconf
@@ -1,3 +1,4 @@
 # Run qdoc from the directory that contains this file.
 include(config/compat.qdocconf)
-include(qtcreator.qdocconf)
+include(config/qtcreator-project.qdocconf)
+include(config/qt-html-templates.qdocconf)
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf
index 7293bce928..b31381f962 100644
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -1,3 +1,3 @@
 # Run qdoc from the directory that contains this file.
 include(config/qtcreator-project.qdocconf)
-include(config/qt-html-templates.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)