Change doc build on windows1.0.0

Do not load qt_docs.prf in the qt module.
Rename qtenginiocpp to qtenginio because the module forces that on us.
Instead of qtenginio for the overview docs we now have qtenginiooverview.
None of this is user visible, so it will be fine.

Change-Id: I77bdcb7f4784323e52b79cbe543e16ad4593e533
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

6 files changed, 13 insertions, 15 deletions

diff --git a/doc/qtenginio.qdocconf b/doc/qtenginiooverview.qdocconf
index 58bef9a..a7e6792 100644
--- a/doc/qtenginio.qdocconf
+++ b/doc/qtenginiooverview.qdocconf
@@ -1,6 +1,6 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
-project = QtEnginio
+project = QtEnginioOverview
 description = Enginio Client Library
 url = http://engin.io
 
@@ -9,13 +9,13 @@ headerdirs += .
 
 imagedirs += images
 
-depends += qtcore qtgui qtwidgets qtnetwork qtdoc qtenginiocpp qtenginioqml
+depends += qtcore qtgui qtwidgets qtnetwork qtdoc qtenginio qtenginioqml
 
 qhp.projects            = Enginio
 
-qhp.Enginio.file                = qtenginio.qhp
-qhp.Enginio.namespace           = io.engin.100
-qhp.Enginio.virtualFolder       = enginio
+qhp.Enginio.file                = qtenginiooverview.qhp
+qhp.Enginio.namespace           = io.engin.overview.100
+qhp.Enginio.virtualFolder       = enginiooverview
 qhp.Enginio.indexTitle          = Enginio Manual
 
 qhp.Enginio.filterAttributes    = enginio 1.0.0
diff --git a/qtenginio.pro b/qtenginio.pro
index ae98f9a..31e76f6 100644
--- a/qtenginio.pro
+++ b/qtenginio.pro
@@ -5,7 +5,7 @@ lessThan(QT_MAJOR_VERSION, 5): error("The Enginio Qt library only supports Qt 5.
 load(configure)
 load(qt_parts)
 
-QMAKE_DOCS = $$PWD/doc/qtenginio.qdocconf
+QMAKE_DOCS = $$PWD/doc/qtenginiooverview.qdocconf
 load(qt_docs)
 
 contains(CONFIG, coverage) {
diff --git a/src/enginio_client/doc/qtenginiocpp.qdocconf b/src/enginio_client/doc/qtenginio.qdocconf
index a93192d..86c7001 100644
--- a/src/enginio_client/doc/qtenginiocpp.qdocconf
+++ b/src/enginio_client/doc/qtenginio.qdocconf
@@ -1,6 +1,6 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
-project = qtenginiocpp
+project = qtenginio
 description = Client library for Enginio
 url = http://engin.io
 
@@ -23,9 +23,9 @@ depends += qtcore qtgui qtwidgets qtnetwork
 
 qhp.projects            = EnginioCpp
 
-qhp.EnginioCpp.file                = qtenginiocpp.qhp
-qhp.EnginioCpp.namespace           = io.engin.cpp.100
-qhp.EnginioCpp.virtualFolder       = qtenginiocpp
+qhp.EnginioCpp.file                = qtenginio.qhp
+qhp.EnginioCpp.namespace           = io.engin.100
+qhp.EnginioCpp.virtualFolder       = qtenginio
 qhp.EnginioCpp.indexTitle          = Enginio C++ Classes and Examples
 qhp.EnginioCpp.indexRoot           =
 
diff --git a/src/enginio_client/enginio_client.pro b/src/enginio_client/enginio_client.pro
index 085890c..d1e1d30 100644
--- a/src/enginio_client/enginio_client.pro
+++ b/src/enginio_client/enginio_client.pro
@@ -3,8 +3,7 @@ QT += core-private network
 DEFINES += ENGINIOCLIENT_LIBRARY
 MODULE = enginio
 
-QMAKE_DOCS = $$PWD/doc/qtenginiocpp.qdocconf
-load(qt_docs)
+QMAKE_DOCS = $$PWD/doc/qtenginio.qdocconf
 
 include(../src.pri)
 
diff --git a/src/enginio_plugin/doc/qtenginioqml.qdocconf b/src/enginio_plugin/doc/qtenginioqml.qdocconf
index 840d2aa..71cad7b 100644
--- a/src/enginio_plugin/doc/qtenginioqml.qdocconf
+++ b/src/enginio_plugin/doc/qtenginioqml.qdocconf
@@ -20,13 +20,13 @@ exampledirs += \
 # Specify example install dir under QT_INSTALL_EXAMPLES
 examplesinstallpath = enginio/quick
 
-depends += qtcore qtgui qtnetwork qtqml qtquick qtquickcontrols qtenginiocpp
+depends += qtcore qtgui qtnetwork qtqml qtquick qtquickcontrols qtenginio
 
 qhp.projects            = EnginioQml
 
 qhp.EnginioQml.file                = qtenginioqml.qhp
 qhp.EnginioQml.namespace           = io.engin.qml.100
-qhp.EnginioQml.virtualFolder       = qtenginio
+qhp.EnginioQml.virtualFolder       = qtenginioqml
 qhp.EnginioQml.indexTitle          = Enginio QML Types and Examples
 qhp.EnginioQml.indexRoot           =
 
diff --git a/src/enginio_plugin/enginio_plugin.pro b/src/enginio_plugin/enginio_plugin.pro
index abae804..40adf81 100644
--- a/src/enginio_plugin/enginio_plugin.pro
+++ b/src/enginio_plugin/enginio_plugin.pro
@@ -5,7 +5,6 @@ TARGETPATH = Enginio
 QT += qml quick enginio enginio-private core-private
 
 QMAKE_DOCS = $$PWD/doc/qtenginioqml.qdocconf
-load(qt_docs)
 
 include(../src.pri)