diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2020-06-25 13:55:03 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-06-29 08:51:05 +0000 |
| commit | 95ec925c123fa802a9899870cc1867a73ca15362 (patch) | |
| tree | 0a3e9244d9452c01a06b61b62d315583f2368c9d | |
| parent | 2c038f10d67f855e21f2b4338b56139d03949c32 (diff) | |
| download | qtdoc-95ec925c123fa802a9899870cc1867a73ca15362.tar.gz | |
Add Qt Marketplace entry to Qt Licensing page
Add an entry that explains licensing for marketplace items, and an
external page to the license agreement text.
Fixes: QTBUG-84422
Change-Id: Ibb1d30400891691febee030fbfd02c4ef6be1514
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit c4fb087637bee5a305636c4b5f323fe9bea85634)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | doc/src/external-resources.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/legal/licenses.qdoc | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 75257c8e..eb005557 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -161,6 +161,11 @@ */ /*! + \externalpage https://www.qt.io/terms-conditions/#marketplace + \title Qt Marketplace License Agreement +*/ + +/*! \externalpage http://doc.qt.io/qbs/index.html \title Qbs Manual */ diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index f6b2299d..6a625849 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -43,6 +43,10 @@ version 3 is appropriate for the development of Qt applications provided you can comply with the terms and conditions of the GNU LGPL version 3 (or GNU GPL version 3). + \li Qt components licensed under the \l{Qt Marketplace License Agreement} + are appropriate for the development of Qt applications commonly with + Qt software components licensed under the commercial or GNU LGPL + version 3 (or GNU GPL version 3) terms and conditions. \endlist Qt contains also \l {Licenses Used in Qt}{third-party code} that is licensed |