aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2018-03-14 15:59:21 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-03-21 05:48:07 +0000
commitf1d22e2a786ec5c8b46e0f7b8735697669fa5aaa (patch)
tree404c6cb9b1da4cd2706af061228b081394bb802c
parent2c0962017e24574b3d92599229384b2e7beb1794 (diff)
Doc: Add a section about licensing
Task-number: QBS-1314 Change-Id: I2cfdf2d826a31523823cec195585725851acd2be Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--doc/external-resources.qdoc15
-rw-r--r--doc/qbs.qdoc39
2 files changed, 52 insertions, 2 deletions
diff --git a/doc/external-resources.qdoc b/doc/external-resources.qdoc
index 0ce7a5542..4a98f9d8d 100644
--- a/doc/external-resources.qdoc
+++ b/doc/external-resources.qdoc
@@ -46,6 +46,21 @@
*/
/*!
+ \externalpage https://doc.qt.io/qt-5/licensing.html
+ \title Qt Licensing
+*/
+
+/*!
+ \externalpage https://www.gnu.org/licenses/gpl-2.0.html
+ \title GNU General Public License, version 2
+*/
+
+/*!
+ \externalpage http://www.linfo.org/bsdlicense.html
+ \title BSD
+*/
+
+/*!
\externalpage https://chocolatey.org/packages/qbs
\title Chocolatey
*/
diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc
index bd799eed2..34b197dba 100644
--- a/doc/qbs.qdoc
+++ b/doc/qbs.qdoc
@@ -85,7 +85,7 @@
\li \l{Appendix A: Building Qbs}
\li \l{Appendix B: Migrating from Other Build Systems}
- \li \l{Appendix C: Code Attributions}
+ \li \l{Appendix C: Licenses and Code Attributions}
\endlist
*/
@@ -1572,7 +1572,42 @@
\previouspage porting-to-qbs.html
\page attributions.html
- \title Appendix C: Code Attributions
+ \title Appendix C: Licenses and Code Attributions
+
+ \section1 Licenses
+
+ The \QBS library and tools are available under commercial licenses from
+ \l{Qt Licensing}{The Qt Company}. In addition, they are available under
+ \l{GNU Lesser General Public License, Version 3} (LGPL version 3) and
+ \l{GNU General Public License, version 2} (GPL version 2).
+
+ Shared functionality, which might be pulled in by user build scripts, is
+ available under commercial licenses,
+ \l{GNU Lesser General Public License, Version 2.1} (LGPL version 2.1) with
+ \l{The Qt Company LGPL Exception version 1.1}, and LGPL version 3.
+
+ Autotests are available under commercial licenses and
+ \l{GNU General Public License Version 3, Annotated with The Qt Company GPL Exception 1.0}.
+
+ Examples are available under commercial licenses and \l{BSD}.
+
+ \section2 GNU Lesser General Public License, Version 3
+
+ \quotefile ../LICENSE.LGPLv3
+
+ \section2 GNU General Public License Version 3, Annotated with The Qt Company GPL Exception 1.0
+
+ \quotefile ../LICENSE.GPL3-EXCEPT
+
+ \section2 GNU Lesser General Public License, Version 2.1
+
+ \quotefile ../LICENSE.LGPLv21
+
+ \section2 The Qt Company LGPL Exception version 1.1
+
+ \quotefile ../LGPL_EXCEPTION.txt
+
+ \section1 Third-Party Attibutions
\QBS contains third-party code, which we gratefully acknowledge:
\generatelist{groupsbymodule attributions-qbs}