summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2020-10-27 14:39:36 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-10-27 15:11:14 +0000
commit763a2394ce0f9bd8d01d4c51139c1e9160622793 (patch)
tree69e902f12c7cabbcb476a6ce7d9fed7d455b6961
parent5301f804c9a09cf18b0639c701c9bbdd43f4388f (diff)
Document Third-Party Code changes in 5.12.10
The changes where obtained by running qtattributionsscanner -output-format json in the sources of both Qt 5.12.9 and Qt 5.12.10 checkouts, and diff'ing these. Task-number: QTBUG-87534 Change-Id: I584460c21a85930c6fb58320bdd84de9d378787e Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e10560e0e3ac3248489acf81a3da9e4264d8e395) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--doc/src/legal/licensechanges.qdoc26
1 files changed, 25 insertions, 1 deletions
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index b89d22da2..99a8993d3 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -36,9 +36,33 @@
\section1 Qt 5.12.10
+ \section2 Qt 3D Module
+ \list
+ \li Use of \l{Assimp - Clipper} under the \e{Boost Software License 1.0} is now documented.
+ \li Use of \l{Assimp - irrXML} under the \e{zlib License} is now documented.
+ \li Use of \l{Assimp - Open3DGC} under the \e{MIT License and BSD 2-Clause \"Simplified\" License} is now documented.
+ \li Use of \l{Assimp - The Parser-OpenDDL} under the \e{MIT License} is now documented.
+ \li Use of \l{Assimp - Poly2Tri Polygon Triangulation Library} under the \e{BSD 3-clause \"New\" or \"Revised\" License} is now documented.
+ \li Use of \l{Assimp - RapidJSON} under the \e{MIT License and BSD 3-Clause \"New\" or \"Revised\" License} is now documented.
+ \li Use of \l{Assimp - Unzip} under the \e{zlib License} is now documented.
+ \li Use of \l{Assimp - Utf8Cpp} under the \e{Boost Software License 1.0} is now documented.
+ \li Use of \l{Assimp - Zip} under the \e{Public Domain License} is now documented.
+ \endlist
+
+ \section2 Qt GUI Module
+
+ \list
+ \l{LibJPEG-turbo} updated got to upstream version 2.0.5.
+ \l{Wintab API} license information updated to \e{LCS-Telegraphics License}
+ \endlist
+
\section2 Qt SQL Module
- \l{sqlite}{SQLite} got updated to upstream version 3.32.3.
+ \l{sqlite}{SQLite} got updated to upstream version 3.33.0.
+
+ \section2 Qt SVG Module
+
+ \l{XSVG} license information updated to \e{Historical Permission Notice and Disclaimer - sell variant License}
\section1 Qt 5.12.9