From 7c5ccdd83ba3a2fe1a182c177e51e8c5987ce0ac Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 1 Jul 2016 16:34:38 +0200 Subject: Add list of 3rd party code attributions to Qt Core, Qt GUI, Qt SQL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also document the current license the modules are available from, since this is not consistent anymore across Qt. Task-number: QTBUG-55139 Change-Id: I117fdb0cda7bd7ff92aa825e29c28f22a8a2f96d Reviewed-by: Lars Knoll Reviewed-by: Topi Reiniö --- src/corelib/doc/src/qtcore-index.qdoc | 14 +++++++++++++- src/gui/doc/src/qtgui.qdoc | 13 +++++++++++++ src/sql/doc/src/qtsql.qdoc | 13 +++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/corelib/doc/src/qtcore-index.qdoc b/src/corelib/doc/src/qtcore-index.qdoc index e2fce5797d..fe9b43507c 100644 --- a/src/corelib/doc/src/qtcore-index.qdoc +++ b/src/corelib/doc/src/qtcore-index.qdoc @@ -101,7 +101,19 @@ \li \l{The Event System} \endlist - \section1 Related Information + \section1 Licenses and Attributions + + Qt Core is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under the + \l{GNU Lesser General Public License, version 3}, or + the \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. + + Furthermore Qt Core potentially contains third party + modules under following permissive licenses: + + \generatelist{groupsbymodule attributions-qtcore} + \section1 Reference These are links to the API reference materials. \list diff --git a/src/gui/doc/src/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc index 9781135960..a9fe520d5e 100644 --- a/src/gui/doc/src/qtgui.qdoc +++ b/src/gui/doc/src/qtgui.qdoc @@ -187,6 +187,19 @@ More info in \l{Drag and Drop} + \section1 Licenses and Attributions + + Qt GUI is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under the + \l{GNU Lesser General Public License, version 3}, or + the \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. + + Furthermore Qt GUI potentially contains third party + modules under following permissive licenses: + + \generatelist{groupsbymodule attributions-qtgui} + \section1 Reference \list \li \l{Qt GUI C++ Classes} diff --git a/src/sql/doc/src/qtsql.qdoc b/src/sql/doc/src/qtsql.qdoc index 9d3a8fbfed..56d714becf 100644 --- a/src/sql/doc/src/qtsql.qdoc +++ b/src/sql/doc/src/qtsql.qdoc @@ -51,6 +51,19 @@ QT += sql \endcode + \section1 Licenses and Attributions + + Qt SQL is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under the + \l{GNU Lesser General Public License, version 3}, or + the \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. + + Furthermore Qt SQL potentially contains third party + modules under following permissive licenses: + + \generatelist{groupsbymodule attributions-qtsql} + \section1 Related Information These are links to the API reference materials and related pages. -- cgit v1.2.3