aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-07-01 15:04:43 +0200
committerJohan Thelin <johan.thelin@pelagicore.com>2016-07-04 06:11:22 +0000
commitccc1f3af652e4f2785d9ac60eeae521130740b1a (patch)
treeb6ca1baa9c4e249f4e402a5a8b738c300ece8939
parentf113a294e99ee10b828f48def890c62333d51b9f (diff)
Doc: Qt Automotive Suite: Link to Install instructionsv1.0_QtAS
Install guide for Qt for Device Creation applies for Qt AS - link to it, set up page navigation, and add a TOC entry for Installation page. Change-Id: I6e8d6420c66af576a4d226b4f1e1f7f5ae16f0dd Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>
-rw-r--r--src/doc/qtautomotivesuite/qtautomotivesuite.qdocconf6
-rw-r--r--src/doc/qtautomotivesuite/src/external-resources.qdoc5
-rw-r--r--src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc17
3 files changed, 27 insertions, 1 deletions
diff --git a/src/doc/qtautomotivesuite/qtautomotivesuite.qdocconf b/src/doc/qtautomotivesuite/qtautomotivesuite.qdocconf
index 86ec9aa..34f967a 100644
--- a/src/doc/qtautomotivesuite/qtautomotivesuite.qdocconf
+++ b/src/doc/qtautomotivesuite/qtautomotivesuite.qdocconf
@@ -18,11 +18,15 @@ qhp.QtAutomotiveSuite.filterAttributes = qtautomotivesuite 1.0.0 qtrefdoc
qhp.QtAutomotiveSuite.customFilters.Qt.name = QtAutomotiveSuite 1.0.0
qhp.QtAutomotiveSuite.customFilters.Qt.filterAttributes = qtautomotivesuite 1.0.0
-qhp.QtAutomotiveSuite.subprojects = overview
+qhp.QtAutomotiveSuite.subprojects = overview install
qhp.QtAutomotiveSuite.subprojects.overview.title = Overview
qhp.QtAutomotiveSuite.subprojects.overview.indexTitle = Qt Automotive Suite Overview
qhp.QtAutomotiveSuite.subprojects.overview.selectors = fake:none
+qhp.QtAutomotiveSuite.subprojects.install.title = Installation
+qhp.QtAutomotiveSuite.subprojects.install.indexTitle = Installing Qt Automotive Suite
+qhp.QtAutomotiveSuite.subprojects.install.selectors = fake:none
+
tagfile = qtautomotivesuite.tags
# TODO: Check dependencies, linking using external URLs for now
diff --git a/src/doc/qtautomotivesuite/src/external-resources.qdoc b/src/doc/qtautomotivesuite/src/external-resources.qdoc
index 9d543fc..9159a32 100644
--- a/src/doc/qtautomotivesuite/src/external-resources.qdoc
+++ b/src/doc/qtautomotivesuite/src/external-resources.qdoc
@@ -119,3 +119,8 @@
\externalpage https://doc.qt.io/QtOTA/index.html
\title Over-The-Air Update
*/
+
+/*!
+ \externalpage https://doc.qt.io/QtForDeviceCreation/qtee-installation-guide.html
+ \title Qt for Device Creation: Installation Guide
+*/
diff --git a/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc b/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc
index 9b571c7..09a958a 100644
--- a/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc
+++ b/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc
@@ -28,6 +28,7 @@
/*!
\page index.html
\title Qt Automotive Suite
+ \nextpage {Qt Automotive Suite Overview}{Overview}
\e {\QAS} is a collection of software components and tools to enable
development of \e In-Vehicle-Infotainment (IVI) systems. Built on top
@@ -45,6 +46,7 @@
\list
\li \l {Qt Automotive Suite Overview}{Overview}
+ \li \l {Installing Qt Automotive Suite}{Install Instructions}
\li \l {Related Information}
\endlist
@@ -62,6 +64,8 @@
/*!
\page qtas-overview.html
\title Qt Automotive Suite Overview
+ \previouspage {Qt Automotive Suite}
+ \nextpage {Installing Qt Automotive Suite}{Installation}
\section1 Components
@@ -163,3 +167,16 @@
tools that assist in enabling distribution of software updates in embedded
Linux devices over wireless networks.
*/
+
+/*!
+ \page qtas-install.html
+ \title Installing Qt Automotive Suite
+ \previouspage {Qt Automotive Suite Overview}{Overview}
+
+ \QAS is based on the \l {Qt for Device Creation} offering. System requirements
+ and install instructions are available here:
+
+ \list
+ \li \l {Qt for Device Creation: Installation Guide}
+ \endlist
+*/