From ad854049c0d8e01c12dd27efd7c00df72b0244c2 Mon Sep 17 00:00:00 2001
From: Jerome Pasion <jerome.pasion@digia.com>
Date: Wed, 22 May 2013 12:33:08 +0200
Subject: [PATCH] Doc: Add information about the installers from Qt Project.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The installers are summarized in a table. The platform pages have links
to the installer page.
Change-Id: Iee2f98556f498118cc4055bf7fc8e6d346db8d69
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
---
doc/src/getting-started/installation.qdoc | 17 ++++----
doc/src/getting-started/installer-README.qdoc | 41 +++++++++++++++++++
doc/src/platforms/supported-platforms.qdoc | 10 ++---
3 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index d6a78349..5ee59a49 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -46,7 +46,9 @@ for your platform from the following list.
\tableofcontents
Qt for X11 has some requirements that are given in more detail
- in the \l{Qt for X11 Requirements} document.
+ in the \l{Qt for X11 Requirements} document. A binary package is available
+ and the \l{Qt Installation Program} page describes the installation in more
+ detail.
\section1 Step 1: Installing the License File (commercial editions only)
If you have the commercial edition of Qt, install your license
@@ -154,13 +156,10 @@ for your platform from the following list.
\tableofcontents
- Qt for Windows has some requirements that are given in more detail
- in the \l{Qt for Windows Requirements} document.
-
- If you have obtained a binary package for this platform,
- consult the installation instructions provided instead of the ones in
- this document.
-
+ Qt for Windows has some requirements that are given in more detail in the
+ \l{Qt for Windows Requirements} document. A binary package is available and
+ the \l{Qt Installation Program} page describes the installation in more
+ detail.
\section1 Step 1: Install the License File (commercial editions only)
@@ -287,6 +286,8 @@ Qt for Mac OS X has some requirements that are given in more detail
in the \l{Qt for Mac OS X Requirements} document.
The following instructions describe how to install Qt from the source package.
+A binary package is available and the \l{Qt Installation Program} page describes
+the installation in more detail.
For the binary package, simply double-click on the Qt.mpkg
and follow the instructions to install Qt. You can later run the \c{uninstall-qt.py}
diff --git a/doc/src/getting-started/installer-README.qdoc b/doc/src/getting-started/installer-README.qdoc
index 7a005571..36f403d1 100644
--- a/doc/src/getting-started/installer-README.qdoc
+++ b/doc/src/getting-started/installer-README.qdoc
@@ -65,6 +65,47 @@ the installation program to complete the installation.
Use the Maintenance Tool under \e{<install_dir>} to remove all installed
components.
+\section2 Platform Installers
+
+Several installers exist for targeting different platforms. The table below
+summarizes the available installers.
+
+ \table
+ \header
+ \li Installer
+ \li Target
+ \row
+ \li Linux (32-bit and 64-bit)
+ \li As provided by Ubuntu
+ \row
+ \li Apple Mac OS X 10.7 and Mac OS X 10.8
+ \li Clang as provided by Apple
+ \row
+ \li Microsoft Windows 7 (32-bit) ANGLE
+ \li MSVC 2010 SP1
+ \row
+ \li Microsoft Windows 7 (32-bit) OpenGL
+ \li MSVC 2010 SP1
+ \row
+ \li Microsoft Windows 7 (32-bit)
+ \li MinGW-builds gcc 4.8.0 (32-bit)
+ \row
+ \li Microsoft Windows 8 (32-bit and 64-bit) ANGLE
+ \li MSVC 2012 SP2
+ \row
+ \li Microsoft Windows 8 (64-bit) OpenGL
+ \li MSVC 2012 SP2
+ \row
+ \li Android Linux 32-bit host installer
+ \li x86, ARMv5, ARMv7 Android targets
+ \row
+ \li Android Linux 64-bit host installer
+ \li x86, ARMv5, ARMv7 Android targets
+ \row
+ \li Android Windows 32-bit host installer
+ \li x86, armv5, armv7 Android targets
+ \endtable
+
\section1 Starting Development Tools
You can start Qt Creator directly after the installation by selecting the option
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 9982769a..d3b9ca23 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -379,13 +379,11 @@
\section1 Availability of Binary Installation Packages
The Qt Project provides binary Qt installation packages for all of the
- reference platforms.
+ reference platforms from \l{http://qt-project.org/downloads}. The site
+ provides download links for all supported development platforms.
- To develop with Qt on other supported platforms, you need to build it from
- source.
-
- Fore more information about the platforms Qt runs on, and the compilers used
- on each platform, see the \l{Platform and Compiler Notes} page.
+ The \l{Qt Installation Program} page has more information about the
+ installers.
\section1 General Legal Disclaimer
--
GitLab