Introduced 'make docs' support

To make it work properly the modules needed to be renamed to match
the qt modules naming convention.

For this is also renamed the folders of the modules to make things easier

36 files changed, 124 insertions, 16 deletions

diff --git a/examples/vehiclefunctions/climate_widget/climate_widget.pro b/examples/vehiclefunctions/climate_widget/climate_widget.pro
index 6d0302f..6115199 100644
--- a/examples/vehiclefunctions/climate_widget/climate_widget.pro
+++ b/examples/vehiclefunctions/climate_widget/climate_widget.pro
@@ -8,7 +8,7 @@
 # written consent of Pelagicore AG.
 ##################################################################################################
 
-QT       += core gui QtIVICore QtIVIVehicleFunctions
+QT       += core gui ivicore ivivehiclefunctions
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
diff --git a/src/imports/core/core.pro b/src/imports/core/core.pro
index c0d61cf..b3c29b5 100644
--- a/src/imports/core/core.pro
+++ b/src/imports/core/core.pro
@@ -15,6 +15,6 @@ TARGETPATH = QtIVICore
 SOURCES += \
     plugin.cpp
 
-QT += QtIVICore
+QT += ivicore
 
 load(qml_plugin)
diff --git a/src/imports/vehiclefunctions/vehiclefunctions.pro b/src/imports/vehiclefunctions/vehiclefunctions.pro
index 9630f74..6b973b4 100644
--- a/src/imports/vehiclefunctions/vehiclefunctions.pro
+++ b/src/imports/vehiclefunctions/vehiclefunctions.pro
@@ -15,6 +15,6 @@ TARGETPATH = QtIVIVehicleFunctions
 SOURCES += \
     plugin.cpp
 
-QT += QtIVICore QtIVIVehicleFunctions
+QT += ivicore ivivehiclefunctions
 
 load(qml_plugin)
diff --git a/src/ivicore/doc/qtivicore.qdocconf b/src/ivicore/doc/qtivicore.qdocconf
new file mode 100644
index 0000000..7f6ee99
--- /dev/null
+++ b/src/ivicore/doc/qtivicore.qdocconf
@@ -0,0 +1,52 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+project           = QtIVICore
+description    = Qt IVI Core Reference Documentation
+version          = $QT_VERSION
+
+
+
+qhp.projects            = QtIVICore
+
+qhp.QtIVICore.file                = qtivicore.qhp
+qhp.QtIVICore.namespace           = org.qt-project.qtivicore.$QT_VERSION_TAG
+qhp.QtIVICore.virtualFolder       = qtivicore
+qhp.QtIVICore.indexTitle          = Qt IVI Core
+qhp.QtIVICore.indexRoot           =
+
+qhp.QtIVICore.filterAttributes    = qtivicore $QT_VERSION qtrefdoc
+qhp.QtIVICore.customFilters.Qt.name = QtIVICore $QT_VERSION
+qhp.QtIVICore.customFilters.Qt.filterAttributes = qtIVICore $QT_VERSION
+qhp.QtIVICore.subprojects         = overviews classes qml examples
+qhp.QtIVICore.subprojects.classes.title = C++ Classes
+qhp.QtIVICore.subprojects.classes.indexTitle = Qt IVI Core C++ Classes
+qhp.QtIVICore.subprojects.classes.selectors = class fake:headerfile
+qhp.QtIVICore.subprojects.classes.sortPages = true
+qhp.QtIVICore.subprojects.qml.title = QML Types
+qhp.QtIVICore.subprojects.qml.indexTitle = Qt IVI Core QML Types
+qhp.QtIVICore.subprojects.qml.selectors = fake:headerfile
+qhp.QtIVICore.subprojects.qml.sortPages = true
+qhp.QtIVICore.subprojects.overviews.title = Overviews
+qhp.QtIVICore.subprojects.overviews.indexTitle = Qt IVI Core Overview
+qhp.QtIVICore.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtIVICore.subprojects.examples.title = Qt IVI Core Examples
+qhp.QtIVICore.subprojects.examples.indexTitle = Qt IVI Core Examples
+qhp.QtIVICore.subprojects.examples.selectors = fake:example
+
+tagfile                 = ../../../doc/qtivicore/qtivicore.tags
+
+depends += qtcore qtdoc qtquick qtqml
+
+headerdirs  += .. \
+                ../../imports/core
+
+sourcedirs  += .. \
+                ../../imports/core \
+
+examplesinstallpath = qtivicore
+
+#imagedirs   += images
+
+navigation.landingpage = "Qt IVI Core"
+navigation.cppclassespage = "Qt IVI Core C++ Classes"
+navigation.qmltypespage = "Qt IVI Core QML Types"
diff --git a/src/core/core.pro b/src/ivicore/ivicore.pro
index 58458f5..202f71c 100644
--- a/src/core/core.pro
+++ b/src/ivicore/ivicore.pro
@@ -8,12 +8,15 @@
 # written consent of Pelagicore AG.
 ##################################################################################################
 
-MODULE = QtIVICore
-TARGET = $$MODULE
+TARGET = QtIVICore
+
 QT = core qml
 CONFIG += c++11
 VERSION = 1.0.0
 
+QMAKE_DOCS = $$PWD/doc/qtivicore.qdocconf
+OTHER_FILES += $$PWD/doc/*.qdoc
+
 CMAKE_MODULE_TESTS = '-'
 
 HEADERS += \
diff --git a/src/core/qtiviabstractfeature.cpp b/src/ivicore/qtiviabstractfeature.cpp
index 4bef086..4bef086 100644
--- a/src/core/qtiviabstractfeature.cpp
+++ b/src/ivicore/qtiviabstractfeature.cpp
diff --git a/src/core/qtiviabstractfeature.h b/src/ivicore/qtiviabstractfeature.h
index 60e8dd5..60e8dd5 100644
--- a/src/core/qtiviabstractfeature.h
+++ b/src/ivicore/qtiviabstractfeature.h
diff --git a/src/core/qtiviglobal.h b/src/ivicore/qtiviglobal.h
index 00f90f8..00f90f8 100644
--- a/src/core/qtiviglobal.h
+++ b/src/ivicore/qtiviglobal.h
diff --git a/src/core/qtiviproxyserviceobject_p.cpp b/src/ivicore/qtiviproxyserviceobject_p.cpp
index 7fc7e9e..7fc7e9e 100644
--- a/src/core/qtiviproxyserviceobject_p.cpp
+++ b/src/ivicore/qtiviproxyserviceobject_p.cpp
diff --git a/src/core/qtiviproxyserviceobject_p.h b/src/ivicore/qtiviproxyserviceobject_p.h
index f0b8bdf..f0b8bdf 100644
--- a/src/core/qtiviproxyserviceobject_p.h
+++ b/src/ivicore/qtiviproxyserviceobject_p.h
diff --git a/src/core/qtiviserviceinterface.h b/src/ivicore/qtiviserviceinterface.h
index bf0a807..bf0a807 100644
--- a/src/core/qtiviserviceinterface.h
+++ b/src/ivicore/qtiviserviceinterface.h
diff --git a/src/core/qtiviservicemanager.cpp b/src/ivicore/qtiviservicemanager.cpp
index f7046ca..f7046ca 100644
--- a/src/core/qtiviservicemanager.cpp
+++ b/src/ivicore/qtiviservicemanager.cpp
diff --git a/src/core/qtiviservicemanager.h b/src/ivicore/qtiviservicemanager.h
index f4c33ef..f4c33ef 100644
--- a/src/core/qtiviservicemanager.h
+++ b/src/ivicore/qtiviservicemanager.h
diff --git a/src/core/qtiviservicemanager_p.h b/src/ivicore/qtiviservicemanager_p.h
index 4d14a3e..4d14a3e 100644
--- a/src/core/qtiviservicemanager_p.h
+++ b/src/ivicore/qtiviservicemanager_p.h
diff --git a/src/core/qtiviserviceobject.cpp b/src/ivicore/qtiviserviceobject.cpp
index 6fa35ab..6fa35ab 100644
--- a/src/core/qtiviserviceobject.cpp
+++ b/src/ivicore/qtiviserviceobject.cpp
diff --git a/src/core/qtiviserviceobject.h b/src/ivicore/qtiviserviceobject.h
index c1e63a8..c1e63a8 100644
--- a/src/core/qtiviserviceobject.h
+++ b/src/ivicore/qtiviserviceobject.h
diff --git a/src/core/qtivisimplediscoverymodel.cpp b/src/ivicore/qtivisimplediscoverymodel.cpp
index c978a29..c978a29 100644
--- a/src/core/qtivisimplediscoverymodel.cpp
+++ b/src/ivicore/qtivisimplediscoverymodel.cpp
diff --git a/src/core/qtivisimplediscoverymodel.h b/src/ivicore/qtivisimplediscoverymodel.h
index e2f5b27..e2f5b27 100644
--- a/src/core/qtivisimplediscoverymodel.h
+++ b/src/ivicore/qtivisimplediscoverymodel.h
diff --git a/src/ivivehiclefunctions/doc/qtivivehiclefunctions.qdocconf b/src/ivivehiclefunctions/doc/qtivivehiclefunctions.qdocconf
new file mode 100644
index 0000000..5a41ee4
--- /dev/null
+++ b/src/ivivehiclefunctions/doc/qtivivehiclefunctions.qdocconf
@@ -0,0 +1,52 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+project           = QtIVIVehicleFunctions
+description    = Qt IVI Vehicle Functions Reference Documentation
+version          = $QT_VERSION
+
+
+
+qhp.projects            = QtIVIVehicleFunctions
+
+qhp.QtIVIVehicleFunctions.file                = qtivivehiclefunctions.qhp
+qhp.QtIVIVehicleFunctions.namespace           = org.qt-project.qtivicore.$QT_VERSION_TAG
+qhp.QtIVIVehicleFunctions.virtualFolder       = qtivivehiclefunctions
+qhp.QtIVIVehicleFunctions.indexTitle          = Qt IVI Vehicle Functions
+qhp.QtIVIVehicleFunctions.indexRoot           =
+
+qhp.QtIVIVehicleFunctions.filterAttributes    = qtivivehiclefunctions $QT_VERSION qtrefdoc
+qhp.QtIVIVehicleFunctions.customFilters.Qt.name = QtIVIVehicleFunctions $QT_VERSION
+qhp.QtIVIVehicleFunctions.customFilters.Qt.filterAttributes = qtIVIVehicleFunctions $QT_VERSION
+qhp.QtIVIVehicleFunctions.subprojects         = overviews classes qml examples
+qhp.QtIVIVehicleFunctions.subprojects.classes.title = C++ Classes
+qhp.QtIVIVehicleFunctions.subprojects.classes.indexTitle = Qt IVI Vehicle Functions C++ Classes
+qhp.QtIVIVehicleFunctions.subprojects.classes.selectors = class fake:headerfile
+qhp.QtIVIVehicleFunctions.subprojects.classes.sortPages = true
+qhp.QtIVIVehicleFunctions.subprojects.qml.title = QML Types
+qhp.QtIVIVehicleFunctions.subprojects.qml.indexTitle = Qt IVI Vehicle Functions QML Types
+qhp.QtIVIVehicleFunctions.subprojects.qml.selectors = fake:headerfile
+qhp.QtIVIVehicleFunctions.subprojects.qml.sortPages = true
+qhp.QtIVIVehicleFunctions.subprojects.overviews.title = Overviews
+qhp.QtIVIVehicleFunctions.subprojects.overviews.indexTitle = Qt IVI Vehicle Functions Overview
+qhp.QtIVIVehicleFunctions.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtIVIVehicleFunctions.subprojects.examples.title = Qt IVI Vehicle Functions Examples
+qhp.QtIVIVehicleFunctions.subprojects.examples.indexTitle = Qt IVI Vehicle Functions Examples
+qhp.QtIVIVehicleFunctions.subprojects.examples.selectors = fake:example
+
+tagfile                 = ../../../doc/qtivivehiclefunctions/qtivivehiclefunctions.tags
+
+depends += qtcore qtdoc qtquick qtqml qtivicore
+
+headerdirs  += .. \
+                ../../imports/vehiclefunctions
+
+sourcedirs  += .. \
+                ../../imports/vehiclefunctions \
+
+examplesinstallpath = qtivivehiclefunctions
+
+#imagedirs   += images
+
+navigation.landingpage = "Qt IVI Vehicle Functions"
+navigation.cppclassespage = "Qt IVI Vehicle Functions C++ Classes"
+navigation.qmltypespage = "Qt IVI Vehicle Functions QML Types"
diff --git a/src/vehiclefunctions/vehiclefunctions.pro b/src/ivivehiclefunctions/ivivehiclefunctions.pro
index 5af37f1..6ecb607 100644
--- a/src/vehiclefunctions/vehiclefunctions.pro
+++ b/src/ivivehiclefunctions/ivivehiclefunctions.pro
@@ -8,12 +8,13 @@
 # written consent of Pelagicore AG.
 ##################################################################################################
 
-MODULE = QtIVIVehicleFunctions
-TARGET = $$MODULE
-QT = core qml QtIVICore
+TARGET = QtIVIVehicleFunctions
+QT = core qml ivicore
 CONFIG += c++11
 VERSION = 1.0.0
 
+QMAKE_DOCS = $$PWD/doc/qtivivehiclefunctions.qdocconf
+
 CMAKE_MODULE_TESTS = '-'
 
 HEADERS += \
diff --git a/src/vehiclefunctions/qtiviclimatecontrol.cpp b/src/ivivehiclefunctions/qtiviclimatecontrol.cpp
index 6bb1ff3..6bb1ff3 100644
--- a/src/vehiclefunctions/qtiviclimatecontrol.cpp
+++ b/src/ivivehiclefunctions/qtiviclimatecontrol.cpp
diff --git a/src/vehiclefunctions/qtiviclimatecontrol.h b/src/ivivehiclefunctions/qtiviclimatecontrol.h
index cce6c07..cce6c07 100644
--- a/src/vehiclefunctions/qtiviclimatecontrol.h
+++ b/src/ivivehiclefunctions/qtiviclimatecontrol.h
diff --git a/src/vehiclefunctions/qtiviclimatecontrolbackendinterface.h b/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h
index e4e046c..e4e046c 100644
--- a/src/vehiclefunctions/qtiviclimatecontrolbackendinterface.h
+++ b/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h
diff --git a/src/vehiclefunctions/qtivivehiclefunctionsglobal.h b/src/ivivehiclefunctions/qtivivehiclefunctionsglobal.h
index dc6a21a..dc6a21a 100644
--- a/src/vehiclefunctions/qtivivehiclefunctionsglobal.h
+++ b/src/ivivehiclefunctions/qtivivehiclefunctionsglobal.h
diff --git a/src/plugins/vehiclefunctions/climate_simulator/climate_simulator.json b/src/plugins/ivivehiclefunctions/climate_simulator/climate_simulator.json
index 048376a..048376a 100644
--- a/src/plugins/vehiclefunctions/climate_simulator/climate_simulator.json
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climate_simulator.json
diff --git a/src/plugins/vehiclefunctions/climate_simulator/climate_simulator.pro b/src/plugins/ivivehiclefunctions/climate_simulator/climate_simulator.pro
index f8b1137..2c4e0b2 100644
--- a/src/plugins/vehiclefunctions/climate_simulator/climate_simulator.pro
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climate_simulator.pro
@@ -14,7 +14,7 @@ PLUGIN_TYPE = qtivi
 PLUGIN_EXTENDS = qtivi
 PLUGIN_CLASS_NAME = QtIVIClimateControlBackendInterface
 
-QT       += core QtIVICore QtIVIVehicleFunctions
+QT       += core ivicore ivivehiclefunctions
 
 load(qt_plugin)
 
diff --git a/src/plugins/vehiclefunctions/climate_simulator/climatecontrolbackend.cpp b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.cpp
index aab13a1..aab13a1 100644
--- a/src/plugins/vehiclefunctions/climate_simulator/climatecontrolbackend.cpp
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.cpp
diff --git a/src/plugins/vehiclefunctions/climate_simulator/climatecontrolbackend.h b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.h
index 5e0fe98..5e0fe98 100644
--- a/src/plugins/vehiclefunctions/climate_simulator/climatecontrolbackend.h
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.h
diff --git a/src/plugins/vehiclefunctions/climate_simulator/climateplugin.cpp b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.cpp
index c97c02a..c97c02a 100644
--- a/src/plugins/vehiclefunctions/climate_simulator/climateplugin.cpp
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.cpp
diff --git a/src/plugins/vehiclefunctions/climate_simulator/climateplugin.h b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.h
index 58b0e04..58b0e04 100644
--- a/src/plugins/vehiclefunctions/climate_simulator/climateplugin.h
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.h
diff --git a/src/plugins/vehiclefunctions/vehiclefunctions.pro b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro
index 33efe89..33efe89 100644
--- a/src/plugins/vehiclefunctions/vehiclefunctions.pro
+++ b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index d02f230..7049bb6 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -9,5 +9,5 @@
 ##################################################################################################
 
 TEMPLATE = subdirs
-SUBDIRS = vehiclefunctions
+SUBDIRS = ivivehiclefunctions
 
diff --git a/src/src.pro b/src/src.pro
index ce92584..e6435f8 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -9,8 +9,8 @@
 ##################################################################################################
 
 TEMPLATE = subdirs
-SUBDIRS = core \
-          vehiclefunctions \
+SUBDIRS = ivicore \
+          ivivehiclefunctions \
           plugins \
           imports
 
diff --git a/sync.profile b/sync.profile
index 50b6d05..4c7c02e 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,6 +1,6 @@
 %modules = ( # path to module name map
-    "QtIVICore" => "$basedir/src/core",
-    "QtIVIVehicleFunctions" => "$basedir/src/vehiclefunctions",
+    "QtIVICore" => "$basedir/src/ivicore",
+    "QtIVIVehicleFunctions" => "$basedir/src/ivivehiclefunctions",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
diff --git a/tests/auto/core/servicemanagertest/servicemanagertest.pro b/tests/auto/core/servicemanagertest/servicemanagertest.pro
index c2300b9..4c157ee 100644
--- a/tests/auto/core/servicemanagertest/servicemanagertest.pro
+++ b/tests/auto/core/servicemanagertest/servicemanagertest.pro
@@ -8,7 +8,7 @@
 # written consent of Pelagicore AG.
 ##################################################################################################
 
-QT       += testlib QtIVICore
+QT       += testlib ivicore
 
 TARGET = tst_servicemanagertest
 CONFIG   += testcase
diff --git a/tests/auto/vehiclefunctions/climatecontroltest/climatecontroltest.pro b/tests/auto/vehiclefunctions/climatecontroltest/climatecontroltest.pro
index 804df98..e89f1e4 100644
--- a/tests/auto/vehiclefunctions/climatecontroltest/climatecontroltest.pro
+++ b/tests/auto/vehiclefunctions/climatecontroltest/climatecontroltest.pro
@@ -8,7 +8,7 @@
 # written consent of Pelagicore AG.
 ##################################################################################################
 
-QT       += testlib QtIVICore QtIVIVehicleFunctions
+QT       += testlib ivicore ivivehiclefunctions
 
 TARGET = tst_climatecontroltest
 CONFIG   += testcase