Fix documentation configurations

- Override defaults (output directory) from the Qt documentation config
- Rename/move *-online.qdocconf files to avoid problems in the future
- Fix navigation (breadcrumbs) to use Qt Automotive as homepage

Change-Id: I1ebf13872a36e9dd9844bf9eac0c749cee9cc7ea
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>

8 files changed, 22 insertions, 11 deletions

diff --git a/src/doc/qtivi/qtivi-online.qdocconf b/src/doc/qtautomotivesuite/online/qtautomotivesuite.qdocconf
index 6c13484..decff9f 100644
--- a/src/doc/qtivi/qtivi-online.qdocconf
+++ b/src/doc/qtautomotivesuite/online/qtautomotivesuite.qdocconf
@@ -3,4 +3,9 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults-online.qdocconf)
 # Add an .html file with sidebar content, used in the online style
 # HTML.stylesheets               += style/qt5-sidebar.html
 
-include(qtivi-project.qdocconf)
+# override defaults for Qt module documentation
+HTML.nosubdirs = "false"
+HTML.outputsubdir = "qtautomotivesuite"
+
+include(../qtautomotivesuite-project.qdocconf)
+
diff --git a/src/doc/qtautomotivesuite/qtautomotivesuite.pro b/src/doc/qtautomotivesuite/qtautomotivesuite.pro
index fd4fcbc..0f42fa9 100644
--- a/src/doc/qtautomotivesuite/qtautomotivesuite.pro
+++ b/src/doc/qtautomotivesuite/qtautomotivesuite.pro
@@ -1,7 +1,6 @@
 TEMPLATE = aux
 build_online_docs: {
-    QMAKE_DOCS_TARGETDIR = qtautomotivesuite
-    QMAKE_DOCS = $$PWD/qtautomotivesuite-online.qdocconf
+    QMAKE_DOCS = $$PWD/online/qtautomotivesuite.qdocconf
 } else {
     QMAKE_DOCS = $$PWD/qtautomotivesuite.qdocconf
 }
diff --git a/src/doc/qtgeniviextras/qtgeniviextras-online.qdocconf b/src/doc/qtgeniviextras/online/qtgeniviextras.qdocconf
index 722bb27..7fdeef8 100644
--- a/src/doc/qtgeniviextras/qtgeniviextras-online.qdocconf
+++ b/src/doc/qtgeniviextras/online/qtgeniviextras.qdocconf
@@ -3,4 +3,8 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults-online.qdocconf)
 # Add an .html file with sidebar content, used in the online style
 # HTML.stylesheets               += style/qt5-sidebar.html
 
-include(qtgeniviextras-project.qdocconf)
+# override defaults for Qt module documentation
+HTML.nosubdirs = "false"
+HTML.outputsubdir = "qtgeniviextras"
+
+include(../qtgeniviextras-project.qdocconf)
diff --git a/src/doc/qtgeniviextras/qtgeniviextras-project.qdocconf b/src/doc/qtgeniviextras/qtgeniviextras-project.qdocconf
index 0de839c..a968391 100644
--- a/src/doc/qtgeniviextras/qtgeniviextras-project.qdocconf
+++ b/src/doc/qtgeniviextras/qtgeniviextras-project.qdocconf
@@ -34,7 +34,9 @@ qhp.QtGeniviExtras.subprojects.examples.sortPages = true
 
 tagfile                 = qtgeniviextras.tags
 
-depends += qtcore qtdoc
+depends += qtcore qtdoc qtautomotivesuite
 
+navigation.homepage    = "Qt Automotive Suite"
 navigation.landingpage = "Qt GENIVI Extras"
 navigation.cppclassespage = "Qt GENIVI Extras C++ Classes"
+buildversion           = "Qt GENIVI Extras"
diff --git a/src/doc/qtgeniviextras/qtgeniviextras.pro b/src/doc/qtgeniviextras/qtgeniviextras.pro
index 3e5ea36..dce04c5 100644
--- a/src/doc/qtgeniviextras/qtgeniviextras.pro
+++ b/src/doc/qtgeniviextras/qtgeniviextras.pro
@@ -1,7 +1,6 @@
 TEMPLATE = aux
 build_online_docs: {
-    QMAKE_DOCS_TARGETDIR = qtgeniviextras
-    QMAKE_DOCS = $$PWD/qtgeniviextras-online.qdocconf
+    QMAKE_DOCS = $$PWD/online/qtgeniviextras.qdocconf
 } else {
     QMAKE_DOCS = $$PWD/qtgeniviextras.qdocconf
 }
diff --git a/src/doc/qtautomotivesuite/qtautomotivesuite-online.qdocconf b/src/doc/qtivi/online/qtivi.qdocconf
index d0a2c31..9cc98ed 100644
--- a/src/doc/qtautomotivesuite/qtautomotivesuite-online.qdocconf
+++ b/src/doc/qtivi/online/qtivi.qdocconf
@@ -3,5 +3,8 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults-online.qdocconf)
 # Add an .html file with sidebar content, used in the online style
 # HTML.stylesheets               += style/qt5-sidebar.html
 
-include(qtautomotivesuite-project.qdocconf)
+# override defaults for Qt module documentation
+HTML.nosubdirs = "false"
+HTML.outputsubdir = "qtivi"
 
+include(../qtivi-project.qdocconf)
diff --git a/src/doc/qtivi/qtivi-project.qdocconf b/src/doc/qtivi/qtivi-project.qdocconf
index 26a43e3..6626607 100644
--- a/src/doc/qtivi/qtivi-project.qdocconf
+++ b/src/doc/qtivi/qtivi-project.qdocconf
@@ -42,7 +42,7 @@ qhp.QtIvi.subprojects.examples.sortPages = true
 
 tagfile                 = qtivi.tags
 
-depends += qtcore qtdoc qtquick qtqml
+depends += qtcore qtdoc qtquick qtqml qtautomotivesuite
 
 examplesinstallpath     = vehiclefunctions
 
diff --git a/src/doc/qtivi/qtivi.pro b/src/doc/qtivi/qtivi.pro
index 09e5ff4..1fe828f 100644
--- a/src/doc/qtivi/qtivi.pro
+++ b/src/doc/qtivi/qtivi.pro
@@ -1,7 +1,6 @@
 TEMPLATE = aux
 build_online_docs: {
-    QMAKE_DOCS_TARGETDIR = qtivi
-    QMAKE_DOCS = $$PWD/qtivi-online.qdocconf
+    QMAKE_DOCS = $$PWD/online/qtivi.qdocconf
 } else {
     QMAKE_DOCS = $$PWD/qtivi.qdocconf
 }