Restructure and rewrite installation part of Getting Started with Qt

Change-Id: I73e2c8d1f2a08241c485ff3e5e69018a9bc7d86b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>

2 files changed, 35 insertions, 25 deletions

diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 3ac171b4..04d7a132 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -30,10 +30,26 @@
     \title Getting Started with Qt
     \brief A quick guide for developers
 
-    \section1 Install Qt
+    \section1 Installing Qt
 
-    You can install the Qt Framework and tools by using an online or offline
-    installer or by building the source packages yourself.
+    You can install the Qt Framework and tools by using an \l{Online Installation}{online}
+    or \l{Offline Installation}{offline} installer, or by
+    \l{Building Qt Sources}{building the source packages yourself}.
+
+    The installers allow you to download and install the following
+    components:
+
+    \list
+    \li Qt libraries, prebuilt for a particular development platform (operating
+     system and compiler)
+    \li Qt Creator integrated development environment (IDE)
+    \li Reference Documentation and examples
+    \li Qt in source code form (needed only if you want to build the framework and
+      tools yourself)
+    \li Add-On components that are relevant for different platforms
+    \endlist
+
+    \section2 Online Installation
 
     In the \e{online installer}, you can select commercial or open source
     versions of Qt, tools, and Add-On components to install. Using the online
@@ -41,29 +57,19 @@
     retrieves the license attached to the account from a server and provides a
     list of available components corresponding to the license.
 
+    The online installer is available from the Qt \l Downloads page.
+
+    \section2 Offline Installation
+
     An \e{offline installer} is a single package that contains all of Qt and
     Add-Ons relevant for a target platform. Users with a commercial license
     can either sign in with their Qt account or with their Qt license key
     during the installation process. The license key is available in the
     \l {Qt Account} Web portal.
 
-    You can download Qt 5 installers from the \l Downloads page.
+    The offline installer is available \l{https://www.qt.io/offline-installer}{here}.
 
-    You can use the Qt installers to download and install the following
-    components:
-
-    \list
-    \li Qt libraries, prebuilt for a particular development platform (operating
-     system and compiler)
-    \li Qt Creator integrated development environment (IDE)
-    \li Reference Documentation and examples
-    \li Qt in source code form (needed only if you want to build the framework and
-      tools yourself)
-    \li Add-On components that are relevant for different platforms
-    \endlist
-
-    After downloading, start the installer like any executable on the
-    development platform.
+    \section2 Installation Process
 
     To run the installer, you need a Qt Account. You can use your Qt Account
     credentials to sign-in to all Qt services, including the forums and wiki.
@@ -73,18 +79,21 @@
     To complete the installation, select the components that you want to install
     and follow the instructions of the installation program.
 
-    Use the Maintenance Tool under \e{<install_dir>} to add components and to
-    update or remove installed components.
-
-    You can also watch the following YouTube video for a complete guide of the
+    The following YouTube video gives a complete walk-through of the
     installation process:
 
     \youtube I5jasWrsxT0
 
+    \section2 Updating or Removing Qt
+
+    Once Qt is installed, you can use the Maintenance Tool under \e{<install_dir>}
+    to add components and to update or remove installed components.
+
     \section2 Platform Requirements
 
-    Developing applications on different platforms are covered in the platform
-    pages.
+    Specific requirements and instructions for developing applications on different
+    platforms are covered in the platform pages.
+
     \list
     \li \l{Qt for Android}{Android}
     \li \l{Qt for iOS}{iOS}
diff --git a/doc/src/platforms/integrity-building-qt-imx6.qdocinc b/doc/src/platforms/integrity-building-qt-imx6.qdocinc
index d9fde2c5..ee0e00a1 100644
--- a/doc/src/platforms/integrity-building-qt-imx6.qdocinc
+++ b/doc/src/platforms/integrity-building-qt-imx6.qdocinc
@@ -121,6 +121,7 @@
     make -j6
     \endcode
 
+    \target installing-qt-for-imx6
     \section1 Installing Qt
 
     If you have not used the configure option \c {-prefix $PWD/qtbase} in \l {Configuring Qt},