From 57249de1b7914ed5f20a8f2c78fd5a808da4f660 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 26 Sep 2022 13:14:34 +0300 Subject: Update supported platforms and compilers for lts-5.15.11 branch Task-number: QTBUG-104281 Change-Id: I8c0e7629927f6e65afe62d818afe7087bd918d05 Reviewed-by: Tarja Sundqvist (cherry picked from commit d75b7a1b89236cb82d50c79af1945ef1512a6c5c) Reviewed-by: Qt Cherry-pick Bot --- doc/src/platforms/supported-platforms.qdocinc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc index 90c93a3dd..ff41ee42c 100644 --- a/doc/src/platforms/supported-platforms.qdocinc +++ b/doc/src/platforms/supported-platforms.qdocinc @@ -51,6 +51,10 @@ \li \c x86_64 \li \b {GCC 5.3.1 via devtoolset-4} \li + \row \li Ubuntu 20.04 + \li \c x86_64 + \li GCC 5 or later, \b {GCC 9} + \li \row \li Ubuntu 18.04 \li \c x86_64 \li GCC 5 or later, \b {GCC 9} -- cgit v1.2.3 From 45440465eae001a93cf15c780183f0f53556320b Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Mon, 26 Sep 2022 15:40:30 +0300 Subject: Document Third-Party Code changes in 5.15.11 The changes where obtained by running qtattributionsscanner -output-format json in the sources of both Qt 5.15.10 and Qt 5.15.11 checkouts, and diff'ing these. Task-number: QTBUG-104280 Change-Id: I2102793532a4db9fd85093f5096fec50444cc568 Reviewed-by: Nicholas Bennett Reviewed-by: Jani Heikkinen (cherry picked from commit 2456728af8c3a304cf3da369a9cce92f249425c0) Reviewed-by: Daniel Smith --- doc/src/legal/licensechanges.qdoc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc index 174ec19be..afaab17bd 100644 --- a/doc/src/legal/licensechanges.qdoc +++ b/doc/src/legal/licensechanges.qdoc @@ -34,6 +34,27 @@ Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules} released with Qt that are relevant to licensing. + \section1 Qt 5.15.11 + + \section2 Qt GUI Module + + \list + \li \l{freetype}{Freetype 2} got updated to upstream version 2.12.1. + \li \l{libjpeg}{LibJPEG-turbo} was updated to upstream version 2.1.4. + \endlist + + \section2 Qt Image Formats + + \list + \li \l{libtiff}{TIFF Software Distribution (libtiff)} got updated to upstream + version 4.4.0. + \li \l{libwebp}{WebP (libwebp)} was updated to upstream version 1.2.4. + \endlist + + \section2 Qt SQL Module + + \l{sqlite}{SQLite} was updated to upstream version 3.39.2. + \section1 Qt 5.15.10 \section2 Qt Core Module -- cgit v1.2.3 From a8a03ad20df47a2d51ee4ebba5434714599547a7 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 6 Oct 2022 17:49:10 +0300 Subject: Bump version to 5.15.12 Change-Id: I15c68b962f8688083570bdce1f02610ce9e1a392 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index f35b1d6bd..0898bebce 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.15.11 +MODULE_VERSION = 5.15.12 -- cgit v1.2.3 From c683a327e1c673eec652c587ebc244697c722219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 27 Sep 2022 09:39:07 +0200 Subject: Doc: Consolidate information about SSL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since Qt 5.15, we only support OpenSSL 1.1.1 or later. Change-Id: Ifc0066767a2bec40dcce7b68bcbdfee2944eb7d9 Reviewed-by: Timur Pocheptsov Reviewed-by: Nicholas Bennett Reviewed-by: Mårten Nordheim (cherry picked from commit aead590843909462686204feb68c76744a3b7e47) --- doc/src/connectivity.qdoc | 3 +-- doc/src/platforms/linux.qdoc | 4 ---- doc/src/platforms/windows.qdoc | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc index 67e59fa15..00d8c9af0 100644 --- a/doc/src/connectivity.qdoc +++ b/doc/src/connectivity.qdoc @@ -81,8 +81,7 @@ that there is no HTTP server class in Qt. For secure communication via SSL, Qt Network offers a wide range of classes alongside the central QSslSocket, e.g. QSslCertificate, QSslConfiguration and -QSslError. The only supported backend for SSL in Qt is OpenSSL, which needs to -be installed separately. +QSslError. For mobile devices, Qt Network offers the \l{Bearer Management}{bearer management} API to track the status of a connection (e.g. getting notified about diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc index d15abf511..4a8e38f9e 100644 --- a/doc/src/platforms/linux.qdoc +++ b/doc/src/platforms/linux.qdoc @@ -747,10 +747,6 @@ above. Do this by adding them to the \c LIBS variable in your project file. - From Qt version 5.2 onwards, the officially supported version for - OpenSSL is 1.0.0 or later. Versions >= 0.9.7 and < 1.0.0 might work, - but are not guaranteed to. - \section2 Qt Plugins All Qt GUI applications require a plugin that implements the \l {Qt diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index cb67bd522..515dee2e9 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -1039,10 +1039,6 @@ When looking at the plugin DLLs the exact same dependencies are listed. - From Qt version 5.2 onwards, the officially supported version - for OpenSSL is 1.0.0 or later. Versions >= 0.9.7 and < 1.0.0 might - work, but are not guaranteed to. - \section2 Qt Plugins All Qt GUI applications require a plugin that implements the \l {Qt -- cgit v1.2.3 From 56398cbc67c26c6efe7f41d3b741697715607f28 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Fri, 7 Oct 2022 17:00:44 +0200 Subject: Fix typo in 'why moc' document Fixes: QTBUG-107245 Change-Id: Ia7eed02b5eff293a3d650e6bae6bdbf01a7acfe9 Reviewed-by: Leena Miettinen (cherry picked from commit b04a538b0e48760bcb3425f72bc2b082f5a5e138) Reviewed-by: Qt Cherry-pick Bot --- doc/src/frameworks-technologies/why-moc.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/frameworks-technologies/why-moc.qdoc b/doc/src/frameworks-technologies/why-moc.qdoc index bb90e2658..68d4bcf6c 100644 --- a/doc/src/frameworks-technologies/why-moc.qdoc +++ b/doc/src/frameworks-technologies/why-moc.qdoc @@ -44,7 +44,7 @@ hack with templates at the cost of code size, readability, portability, usability, extensability, robustness and ultimately design beauty. Both templates and the C preprocessor can be stretched - to do incredibility smart and mind boggling things. But just because + to do incredibly smart and mind boggling things. But just because those things can be done, it does not necessarily mean doing them is the right design choice. Code, unfortunately, is not meant to be published in books, but compiled with real-world compilers on real-world operating -- cgit v1.2.3 From 1939ffaa00d5e0b47080127a73c382e199070101 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 7 Dec 2022 13:08:16 +0200 Subject: Document Third-Party Code changes in 5.15.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The changes were obtained by running qtattributionsscanner -output-format json in the sources of both Qt 5.15.11 and Qt 5.15.12 checkouts and diff'ing these. Pick-to: 5.15 Change-Id: I5c0fa2d307632972b443350c38086b45a836e93b Reviewed-by: Nicholas Bennett Reviewed-by: Topi Reiniö Reviewed-by: Paul Wicking Reviewed-by: Jani Heikkinen --- doc/src/legal/licensechanges.qdoc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc index afaab17bd..069add386 100644 --- a/doc/src/legal/licensechanges.qdoc +++ b/doc/src/legal/licensechanges.qdoc @@ -34,6 +34,20 @@ Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules} released with Qt that are relevant to licensing. + \section1 Qt 5.15.12 + + \section2 Qt Core Module + + \list + \li \l{zlib}{Data Compression Library (zlib)} was updated to version 1.2.13. + \endlist + + \section2 Qt GUI Module + + \list + \li \l{libpng}{LibPNG} got updated to upstream version 1.6.38. + \endlist + \section1 Qt 5.15.11 \section2 Qt GUI Module -- cgit v1.2.3