diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2013-11-15 12:01:53 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-15 18:58:21 +0100 |
commit | 031557fc72073e4bda24ecf550c74c3105a154b3 (patch) | |
tree | 11b683a14cbf2338833ec2e278fc637ab195c59b | |
parent | ed1226d1120974d58666fd3f2ca080c660f34d9f (diff) |
Doc: Added information about the Try Qt Enterprise page.
Task-number: QTBUG-33360
Change-Id: I2e7e3e8f9256a52ffe8f3fabe0238413cc7a3f8a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r-- | doc/src/external-resources.qdoc | 5 | ||||
-rw-r--r-- | doc/src/getting-started/gettingstarted.qdoc | 6 | ||||
-rw-r--r-- | doc/src/getting-started/installation.qdoc | 2 | ||||
-rw-r--r-- | doc/src/getting-started/installer-README.qdoc | 3 |
4 files changed, 13 insertions, 3 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 8c98411c4..145e74953 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -108,3 +108,8 @@ \externalpage https://play.google.com/apps/publish \title Google Play Developer Console */ + +/*! + \externalpage http://qt.digia.com/Try-Qt-Now/ + \title Try Qt Enterprise +*/ diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc index 95d144c2f..e124b08fc 100644 --- a/doc/src/getting-started/gettingstarted.qdoc +++ b/doc/src/getting-started/gettingstarted.qdoc @@ -34,12 +34,14 @@ The \l{Opensource Downloads}{Downloads} page contains Qt download links, where Qt and Qt Creator can be downloaded for different development - platforms. + platforms. The Qt Enterprise packages are available from the + \l{Try Qt Enterprise} page. \section2 Installing with the Installation Program The Qt Installation Program can download the Qt libraries and tools as well - as the reference documentation and code samples. The \l{Qt Installation + as the reference documentation and code samples. The + \l{Qt Installation Program} page contains information about installation process. \section2 Installing from the Qt Sources diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 17667c54b..f5a9d656d 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -37,6 +37,8 @@ There are two ways to install Qt: project.org/downloads}. \endlist +\note Qt Enterprise packages are available from the \l{Try Qt Enterprise} page. + This page lists the relevant information for installing Qt by building the Qt sources. The installation procedure is different on each Qt platform. This page collects the relevant information for the \l{Supported Platforms}. diff --git a/doc/src/getting-started/installer-README.qdoc b/doc/src/getting-started/installer-README.qdoc index 68e72e0e7..ac3415310 100644 --- a/doc/src/getting-started/installer-README.qdoc +++ b/doc/src/getting-started/installer-README.qdoc @@ -54,7 +54,8 @@ so on). \section1 Installing Qt 5 You can download Qt 5 from \l{http://qt-project.org/downloads}. The site -provides download links for all supported development platforms. +provides download links for all supported development platforms. The Qt +Enterprise packages are available from the \l{Try Qt Enterprise} page. Start the installation program like any executable on the development platform. On Linux, you might first have to make the installation program executable. |