summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-04-28 11:27:37 +0200
committerLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-04-29 12:18:19 +0000
commit20b037af0243e7b4757898ae1f577dbde6913f59 (patch)
tree64092f6d928acd1bff660ba7ab27466f23aea604
parent55a377c79949bf77dd281ed84cdf2290dd1235fd (diff)
Update the getting started topicv5.5.0-beta1
Update the instructions to describe the unified Qt installer and mention the Qt Account. Change-Id: Id21179558e2e6366366d6c9a0b094eba14b87ef3 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--doc/src/external-resources.qdoc5
-rw-r--r--doc/src/getting-started/gettingstarted.qdoc29
2 files changed, 24 insertions, 10 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 3a8e81354..7a7256a78 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -287,3 +287,8 @@
\externalpage http://www.bluetooth.org
\title Bluetooth SIG
*/
+
+/*!
+ \externalpage http://www.qt.io/qt-account/
+ \title Qt Account
+*/
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 4de68b198..0ae1e3eac 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -30,11 +30,14 @@
\title Getting Started with Qt
\brief A quick guide for developers
- Qt Framework and tools can be installed using an online installer,
- offline installers, or by building the source packages yourself.
- The \e{online installers} give you the option to download or install only
- certain modules or add-ons. An \e{offline installer} is a single package
- which contains all of Qt and Add-Ons relevant for a target platform.
+ You can install the Qt Framework and tools by using an online or offline
+ installer or by building the source packages yourself. In the
+ \e{online installer}, you can select the Qt versions, tools, and Add-On
+ components to download and install depending on the license attached to your
+ \l{Qt Account}.
+
+ An \e{offline installer} is a single package that contains all of Qt and
+ Add-Ons relevant for a target platform.
You can download Qt 5 installers from the \l Downloads page.
@@ -52,12 +55,18 @@
\endlist
After downloading, start the installer like any executable on the
- development platform. Select the components that you want to install and
- follow the instructions of the installation program to complete the
- installation.
+ development platform.
+
+ 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.
+ If you do not already have a Qt Account, you can create one during the
+ installation process.
+
+ 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, update, or remove
- installed components.
+ Use the Maintenance Tool under \e{<install_dir>} to add components and to
+ update or remove installed components.
\section2 Platform Requirements