diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2014-10-03 15:01:57 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@digia.com> | 2014-10-10 20:18:42 +0200 |
| commit | e65928a5b67d58c09157af1e1490fff1ae7b3fdb (patch) | |
| tree | 2b09067a7d9fd218b5d13b9a32cae2028ff1e494 /doc/src/getting-started/gettingstarted.qdoc | |
| parent | 760fcde962db342d2bd2ec333667fe08bfbae57e (diff) | |
Doc: Update Qt licensing documentationv5.4.0-beta1
Update the documentation to cover the inclusion of LGPL version 3
licensing option.
Add information about the Apache 2.0 licensed code used for the
Native style for Android.
Add information about the Wayland protocol license for Qt
Wayland.
Fix layout issues in the table describing the other licenses, as
well as a wrong license type listed for Qt Script module.
Fix a number of external links and remove links pointing to
the old download page for commercial Qt versions.
Task-number: QTBUG-41024
Task-number: QTBUG-41798
Change-Id: I203b2ace6cc379da3b0cab12b6197b35c195720c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'doc/src/getting-started/gettingstarted.qdoc')
| -rw-r--r-- | doc/src/getting-started/gettingstarted.qdoc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc index 3d51cdf1a..5054593b3 100644 --- a/doc/src/getting-started/gettingstarted.qdoc +++ b/doc/src/getting-started/gettingstarted.qdoc @@ -36,9 +36,7 @@ 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. - The open-source versions are found at the \l Downloads page - and the commercial versions are available for a free trial from - \l{Try Qt Enterprise}{Digia}. + You can download Qt 5 installers from the \l Downloads page. You can use the Qt installers to download and install the following components: @@ -111,6 +109,6 @@ \section1 Qt Project Community - Qt's vibrant and active community site, \l{http://qt-project.org} houses + Qt's vibrant and active community site, \l{http://qt.io} houses a wiki, a forum, and additional learning guides and presentations. */ |