From 4e0244ef65f3f15e6ccd4da3d5b32100c0962984 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. Change-Id: I5c0fa2d307632972b443350c38086b45a836e93b Reviewed-by: Nicholas Bennett Reviewed-by: Topi Reiniö Reviewed-by: Paul Wicking Reviewed-by: Jani Heikkinen (cherry picked from commit 1939ffaa00d5e0b47080127a73c382e199070101) Reviewed-by: Qt Cherry-pick Bot --- 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 From 9256452395a865afaab3f8d54d463fe623e7dad8 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 22 Dec 2022 11:11:18 +0200 Subject: Bump version to 5.15.13 Change-Id: I8c2a59c3160e4acc9072e77ce7510d2cb0115a24 Reviewed-by: Tarja Sundqvist --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 0898bebce..3880db6dc 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.15.12 +MODULE_VERSION = 5.15.13 -- cgit v1.2.3 From 1ad48d103e985d28086237eb6c89f7b068923b18 Mon Sep 17 00:00:00 2001 From: Nicholas Bennett Date: Thu, 12 Jan 2023 08:53:45 +0100 Subject: Docs: Update JDK requirements to 11 or later MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed "earlier" to "later" on the android getting started page and the building Qt for Android page. Fixes: QTBUG-110064 Change-Id: I92efce99dc8c906a3bbbee74a3c9de19e0bc7e9d Reviewed-by: Assam Boudjelthia Reviewed-by: Rami Potinkara Reviewed-by: Tero Alamäki --- doc/src/platforms/android/android-building.qdoc | 6 ++---- doc/src/platforms/android/android.qdoc | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/src/platforms/android/android-building.qdoc b/doc/src/platforms/android/android-building.qdoc index 8b88efa42..942753cc9 100644 --- a/doc/src/platforms/android/android-building.qdoc +++ b/doc/src/platforms/android/android-building.qdoc @@ -104,11 +104,11 @@ preferably at the end of \c{~/.profile}: \badcode - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 + export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 export PATH=$JAVA_HOME/bin:$PATH \endcode - \note JDK 11 or earlier must be used to properly build Qt for Android. + \note \note As of Qt 5.15.8, JDK 11 or later is supported for Qt for Android. \note We use \l{OpenJDK} here, but you can also use other JDK alternatives such as \l{AdoptOpenJDK}. @@ -190,8 +190,6 @@ The command should list javac.exe under the path \e {} first. - \note JDK 11 or earlier must be used to properly build Qt for Android. - \note Qt for Android does not support building with Microsoft Visual C++ (MSVC), we only support building with MinGW. diff --git a/doc/src/platforms/android/android.qdoc b/doc/src/platforms/android/android.qdoc index 576056f17..e5e4ffd28 100644 --- a/doc/src/platforms/android/android.qdoc +++ b/doc/src/platforms/android/android.qdoc @@ -98,7 +98,7 @@ In order to use \l{Qt for Android}, you need the following: is required to build Android apps. Other alternatives such as \l{OpenJDK} for Linux or \l{Java SE Development Kit} for Windows are also supported. - \note JDK 11 or earlier must be used when using Qt for Android. + \note As of Qt 5.15.8, JDK 11 or later is supported for Qt for Android. \li \l{Gradle} for building application packages (APK) and app bundles (AAB) for Android devices. Gradle is delivered with Qt 5.9, and later. -- cgit v1.2.3 From b7cdca45f01475f34ceca387261837720b966adf Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Tue, 21 Feb 2023 16:01:31 +0200 Subject: Document Third-Party Code changes in 5.15.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The changes where obtained by running qtattributionsscanner -output-format json in the sources of both Qt 5.15.13 and Qt 5.15.12 checkouts, and diff'ing these. Task-number: QTBUG-109891 Pick-to: 5.15 Change-Id: Ie34d3231d1d9b8e374a18e9ae3f06122f3832fb2 Reviewed-by: Topi Reiniö --- doc/src/legal/licensechanges.qdoc | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc index 069add386..56dd9b063 100644 --- a/doc/src/legal/licensechanges.qdoc +++ b/doc/src/legal/licensechanges.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2022 The Qt Company Ltd. +** Copyright (C) 2023 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -34,6 +34,31 @@ Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules} released with Qt that are relevant to licensing. + \section1 Qt 5.15.13 + + \section2 Qt Core Module + + \l{pcre2}{PCRE2} was updated to version 10.42. + + \section2 Qt GUI Module + + \list + \li \l{libjpeg}{LibJPEG-turbo} was updated to upstream version 2.1.5. + \li \l{libpng}{LibPNG} got updated to upstream version 1.6.39. + \endlist + + \section2 Qt Image Formats + + \list + \li \l{libtiff}{TIFF Software Distribution (libtiff)} got updated to upstream + version 4.5.0. + \li \l{libwebp}{WebP (libwebp)} was updated to upstream version 1.3.0. + \endlist + + \section2 Qt SQL Module + + \l{sqlite}{SQLite} was updated to upstream version 3.40.1. + \section1 Qt 5.15.12 \section2 Qt Core Module -- cgit v1.2.3