Doc: Fix docbuild when not using -developer-build.

https://codereview.qt-project.org/#change,33974 only works in the case
of a developer build. Not in a normal prefix build.

Change-Id: I3a3e5029cefaa9f83c5deb71665f0efa9d812819
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>

diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf
index 4d5bc91..2c2b9f9 100644 (file)
--- a/src/concurrent/doc/qtconcurrent.qdocconf
+++ b/src/concurrent/doc/qtconcurrent.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtConcurrent
 description             = Qt Concurrent Reference Documentation

diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index 69c753b..86bf914 100644 (file)
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtCore
 description             = Qt Core Reference Documentation

diff --git a/src/dbus/doc/qtdbus.qdocconf b/src/dbus/doc/qtdbus.qdocconf
index e789fb3..7785b06 100644 (file)
--- a/src/dbus/doc/qtdbus.qdocconf
+++ b/src/dbus/doc/qtdbus.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtDBus
 description             = Qt DBus Reference Documentation

diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
index 85fcbab..b154a6d 100644 (file)
--- a/src/gui/doc/qtgui.qdocconf
+++ b/src/gui/doc/qtgui.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtGui
 description             = Qt GUI Reference Documentation

diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf
index 1e9d743..c39b4e2 100644 (file)
--- a/src/network/doc/qtnetwork.qdocconf
+++ b/src/network/doc/qtnetwork.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtNetwork
 description             = Qt Network Reference Documentation

diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf
index 58ead7c..6ac0087 100644 (file)
--- a/src/opengl/doc/qtopengl.qdocconf
+++ b/src/opengl/doc/qtopengl.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtOpenGL
 description             = Qt OpenGL Reference Documentation

diff --git a/src/printsupport/doc/qtprintsupport.qdocconf b/src/printsupport/doc/qtprintsupport.qdocconf
index e2d4875..0e473ef 100644 (file)
--- a/src/printsupport/doc/qtprintsupport.qdocconf
+++ b/src/printsupport/doc/qtprintsupport.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtPrintSupport
 description             = Qt Print Support Reference Documentation

diff --git a/src/sql/doc/qtsql.qdocconf b/src/sql/doc/qtsql.qdocconf
index e4abfbe..03821f5 100644 (file)
--- a/src/sql/doc/qtsql.qdocconf
+++ b/src/sql/doc/qtsql.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtSql
 description             = Qt SQL Reference Documentation

diff --git a/src/testlib/doc/qttest.qdocconf b/src/testlib/doc/qttest.qdocconf
index 7505717..d8b6646 100644 (file)
--- a/src/testlib/doc/qttest.qdocconf
+++ b/src/testlib/doc/qttest.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtTest
 description             = Qt Test Reference Documentation

diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf
index 5f5a511..6f22dfb 100644 (file)
--- a/src/widgets/doc/qtwidgets.qdocconf
+++ b/src/widgets/doc/qtwidgets.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtWidgets
 description             = Qt Widgets Reference Documentation

diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf
index cafc2fa..093fcdd 100644 (file)
--- a/src/xml/doc/qtxml.qdocconf
+++ b/src/xml/doc/qtxml.qdocconf
@@ -1,5 +1,5 @@
-include(global/qt-html-templates-offline.qdocconf)
-include(global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
 
 project                 = QtXml
 description             = Qt XML Reference Documentation