diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2016-12-02 13:31:02 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-12-07 05:55:36 +0000 |
| commit | b54e186ffb0793f314225ec7fd86293c43a9cad7 (patch) | |
| tree | 1930de6665771c590da72073a16422974341a901 | |
| parent | 8d6daec1daa675953e0189554908754e2cccddec (diff) | |
| download | qtdoc-b54e186ffb0793f314225ec7fd86293c43a9cad7.tar.gz | |
Doc: Mention GPLv3-licensed modules in 'Licenses Used in Qt' page
The page acts as an overview of different licenses used in Qt code,
so in addition to 3rd party licenses, mention also the GPLv3
modules there.
Change-Id: I6bf940fa7e9ce5fd04b11e3c9a97d622417a9802
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | doc/src/legal/licenses.qdoc | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index 323f1479..16c683a0 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -48,7 +48,7 @@ \note Some specific parts (modules) of the Qt framework are not available under the GNU LGPL version 3, but under the \l {GNU General Public License (GPL)} instead. See - \l {All Modules#Qt Add-Ons}{Qt Modules} for details. + \l {Licenses Used in Qt} for details. \e {Qt documentation} is licensed under the terms of the \l{GNU Free Documentation License (FDL)} version 1.3, as published by the Free Software @@ -64,10 +64,10 @@ For further information and assistance about Qt licensing, contact our sales; see \l{http://www.qt.io/locations/} for contact details. - \section1 Third-party Licenses Used in Qt + \section1 Licensed Code in Qt - The following page documents the third-party open-source licenses used - in different parts of Qt: + The following page documents the open-source licenses used in different + parts of Qt: \list \li \l {Licenses Used in Qt} @@ -92,6 +92,24 @@ third-party components that you are using with your application. Click the name of the component to see the licensing details. + \b {Modules Licensed Under GPLv3} + + A number of Qt modules are only licensed under the \l{Qt Commercial License} + or the \l{GNU General Public License (GPL)} version 3: + + \div {class="fixed"} + \table + \row \li \l {Qt Charts} + \li Commercial Licenses, or GNU General Public License v3 + \row \li \l {Qt Data Visualization} + \li Commercial Licenses, or GNU General Public License v3 + \row \li \l {Qt Virtual Keyboard} + \li Commercial Licenses, or GNU General Public License v3 + \endtable + \enddiv + + \b {Third-party Licenses} + The following table lists parts (modules) of Qt that incorporate code licensed under third-party open-source licenses: |