summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2022-03-02 16:41:41 +0200
committerTarja Sundqvist <tarja.sundqvist@qt.io>2022-03-02 16:41:41 +0200
commit6ca6c8fc1641dd78868215cf2e08ad8eff40c5c2 (patch)
tree25048ed1229ea73b1544f37ab12f1e31ba13df46
parent897e90fe304d844beaf694b82a93a50237fa8b9e (diff)
parent4047cead3e052713a54c70f143c09dcf7f19a9bb (diff)
downloadqtdoc-6ca6c8fc1641dd78868215cf2e08ad8eff40c5c2.tar.gz
Merge tag 'v5.15.3-lts-lgpl' into 5.15
Qt 5.15.3-lts-lgpl Release
-rw-r--r--doc/src/external-resources.qdoc16
-rw-r--r--doc/src/legal/licensechanges.qdoc27
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc18
3 files changed, 43 insertions, 18 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index bb9e038e..d983ecb1 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -346,12 +346,12 @@
*/
/*!
- \externalpage http://doc.qt.io/qtcreator/creator-build-example-application.html
- \title Building and Running Example
+ \externalpage https://doc.qt.io/qtcreator/creator-build-example-application.html
+ \title Qt Creator: Building and Running an Example
*/
/*!
- \externalpage http://doc.qt.io/qtcreator/qt-creator-accelbubble-example.html
- \title Creating a Mobile Application
+ \externalpage https://doc.qt.io/qtcreator/qtcreator-accelbubble-example.html
+ \title Qt Creator: Creating a Mobile Application
*/
/*!
\externalpage http://wiki.qt.io/Qt5ForAndroidBuilding
@@ -389,7 +389,7 @@
*/
/*!
- \externalpage http://doc.qt.io/QtForDeviceCreation
+ \externalpage https://doc.qt.io/QtForDeviceCreation-5.15
\title Qt for Device Creation
*/
@@ -451,15 +451,15 @@
\title Enginio Manual
*/
/*!
- \externalpage http://doc.qt.io/QtForDeviceCreation/qtb2-index.html
+ \externalpage https://doc.qt.io/QtForDeviceCreation-5.15/qtb2-index.html
\title Boot2Qt
*/
/*!
- \externalpage https://doc.qt.io/QtForDeviceCreation/qt-configuration-tool.html
+ \externalpage https://doc.qt.io/QtForDeviceCreation-5.15/qt-configuration-tool.html
\title Qt Configuration Tool
*/
/*!
- \externalpage https://doc.qt.io/QtForDeviceCreation/qtdc-supported-platforms.html
+ \externalpage https://doc.qt.io/QtForDeviceCreation-5.15/qtdc-supported-platforms.html
\title Qt for Device Creation: Supported Target Devices and Development Hosts
*/
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index b94e3891..4a3f1e66 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -34,6 +34,33 @@
Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
released with Qt that are relevant to licensing.
+ \section1 Qt 5.15.3
+
+ \section2 Qt Core Module
+
+ \list
+ \li \l{pcre2}{PCRE2} got updated to upstream version 10.36.
+ \li The copy of the \l{psl}{The Public Suffix List} got updated on
+ 2021-01-21.
+ \li \l{unicode-cldr}{Unicode Common Locale Data Repository (CLDR)} got updated to
+ upstream version v38.
+ \endlist
+
+ \section2 Qt GUI Module
+
+ \l{md4c}{MD4C} got updated to upstream version 0.4.6.
+
+ \section2 Qt SQL Module
+
+ \l{sqlite}{SQLite} got updated to upstream version 3.34.0.
+
+ \section2 Qt WebEngine Module
+
+ \list
+ \li The Chromium version has been updated to 87.0.4280.144.
+ \li Chromium received backported security fixes from Chromium up to version
+ 88.0.4324.150.
+ \endlist
\section1 Qt 5.15.2
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index df512d79..0909b384 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -37,11 +37,11 @@
\header \li Distribution \li Architecture \li Compiler \li Notes
\row \li openSUSE 15.1
\li \c x86_64
- \li GCC 5 or later, \b {GCC 7}, \b {ICC 19.1}
+ \li GCC 5 or later, \b {GCC 7.5.0}, \b {ICC 19.1}
\li
\row \li SUSE Linux Enterprise Server
\li \c x86_64
- \li GCC 5 or later, \b {GCC 10}
+ \li GCC 5 or later, \b {GCC 10.2.1}
\li
\row \li Red Hat Enterprise Linux 7.6
\li \c x86_64
@@ -49,7 +49,7 @@
\li
\row \li Ubuntu 18.04
\li \c x86_64
- \li GCC 5 or later, \b {GCC 9}
+ \li GCC 5 or later, \b {GCC 9.3.0}
\li
\row \li Generic Linux
\li \c x86 and \c x86_64
@@ -64,7 +64,7 @@
\header \li Target Platform \li Architecture \li Build Environment
\row \li \macos 10.13, 10.14, \b 10.15, 11.0
\li \c x86_64 and \c x86_64h
- \li Xcode \b{11 (10.15 SDK)}, 12 (11.0 SDK)
+ \li Xcode 11 or \b 12 (10.15 SDK)
\endtable
//! [macos]
@@ -74,7 +74,7 @@
\header \li Operating System \li Architecture \li Compiler \li Notes
\row \li Windows 10
\li \c x86 and \c x86_64
- \li \b {MSVC 2019}, MSVC 2017, \b {MinGW 8.1}
+ \li \b {MSVC 2019}, MSVC 2017, MSVC 2015, MinGW 8.1
\li
\row \li Windows 8.1
\li \c x86 and \c x86_64
@@ -82,7 +82,7 @@
\li
\row \li Windows 7
\li \c x86 and \c x86_64
- \li MSVC 2019, MSVC 2017, \b {MinGW 8.1}
+ \li MSVC 2019, MSVC 2017, MinGW 8.1
\li \l{https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z/download}{MinGW-builds GCC 8.1.0 (x86)}
\endtable
@@ -100,8 +100,7 @@
\row \li Android 5.0 or later (that is, API Level 21 and up)
\li \c armv7a and \c x86, \c arm64-v8 and \c x86_64
\li \b {Clang as provided by Google}, \b {MinGW 8.1}
- \li \b {RHEL 7.x (x86_64)}, \b{\macos 10.14}, \b {Windows 10 (x86_64)},
- \b Windows 7
+ \li \b {RHEL 7.x (x86_64)}, \b{\macos 10.15}, \b {Windows 10 (x86_64)}
\endtable
//! [android]
@@ -163,8 +162,7 @@ directly. Browsers often blacklist WebGL for older/unsupported GPUs.
For embedded platform support, including \l{Qt for Embedded Linux}{Embedded Linux},
\l{Qt for INTEGRITY}{INTEGRITY}, \l{Qt for QNX}{QNX}, and \l{Qt for VxWorks}{VxWorks},
-please consult the \l {http://doc.qt.io/QtForDeviceCreation}{Qt for Device Creation}
-documentation.
+please consult the \l {Qt for Device Creation} documentation.
//! [embedded]