Doc: Revert to external linkingv1.1_QtAS

The documentation is now built from a super-repository, which
enables doc linking with dependencies - however, the build
process is not yet designed for this and needs more work.

In the meantime, link using the \externalpage commands.

Change-Id: Icce3d2d2ea2e1c2423bc493ecb4c99423b0c189f
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

5 files changed, 77 insertions, 5 deletions

diff --git a/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf b/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf
index 37b4d82..5c746e2 100644
--- a/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf
+++ b/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf
@@ -44,9 +44,6 @@ depends += \
      qtquick \
      neptuneui
 
-indexes += ../../../doc/qtgeniviextras/qtgeniviextras.index \
-           ../../../doc/qtivi/qtivi.index
-
 buildversion = "Qt Automotive Suite 1.1"
 
 macro.QAS = "Qt Automotive Suite"
diff --git a/src/doc/qtautomotivesuite/src/external-resources.qdoc b/src/doc/qtautomotivesuite/src/external-resources.qdoc
index dc31439..bcac20c 100644
--- a/src/doc/qtautomotivesuite/src/external-resources.qdoc
+++ b/src/doc/qtautomotivesuite/src/external-resources.qdoc
@@ -104,3 +104,13 @@
     \externalpage https://doc.qt.io/NeptuneUI/index.html
     \title Neptune UI
 */
+
+/*!
+    \externalpage https://doc.qt.io/QtIVI/index.html
+    \title Qt IVI
+*/
+
+/*!
+    \externalpage https://doc.qt.io/QtGENIVIExtras/index.html
+    \title Qt GENIVI Extras
+*/
diff --git a/src/doc/qtgeniviextras/src/external-resources.qdoc b/src/doc/qtgeniviextras/src/external-resources.qdoc
new file mode 100644
index 0000000..896fa13
--- /dev/null
+++ b/src/doc/qtgeniviextras/src/external-resources.qdoc
@@ -0,0 +1,36 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Automotive Suite.
+**
+** $QT_BEGIN_LICENSE:FDL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \externalpage http://www.genivi.org/
+    \title GENIVI
+*/
+
+/*!
+    \externalpage https://doc.qt.io/QtAutomotiveSuite/index.html
+    \title Qt Automotive Suite
+*/
diff --git a/src/doc/qtivi/qtivi-project.qdocconf b/src/doc/qtivi/qtivi-project.qdocconf
index 5239909..6626607 100644
--- a/src/doc/qtivi/qtivi-project.qdocconf
+++ b/src/doc/qtivi/qtivi-project.qdocconf
@@ -44,8 +44,6 @@ tagfile                 = qtivi.tags
 
 depends += qtcore qtdoc qtquick qtqml qtautomotivesuite
 
-indexes += ../../../doc/qtautomotivesuite/qtautomotivesuite.index
-
 examplesinstallpath     = vehiclefunctions
 
 navigation.homepage = "Qt Automotive Suite"
diff --git a/src/doc/qtivi/src/external-resources.qdoc b/src/doc/qtivi/src/external-resources.qdoc
new file mode 100644
index 0000000..c48930b
--- /dev/null
+++ b/src/doc/qtivi/src/external-resources.qdoc
@@ -0,0 +1,31 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Automotive Suite.
+**
+** $QT_BEGIN_LICENSE:FDL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \externalpage https://doc.qt.io/QtAutomotiveSuite/index.html
+    \title Qt Automotive Suite
+*/