Merge tag 'v5.15.13-lts-lgpl' into 5.155.15

Qt 5.15.13-lts-lgpl release

4 files changed, 30 insertions, 7 deletions

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
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
diff --git a/doc/src/platforms/android/android-building.qdoc b/doc/src/platforms/android/android-building.qdoc
index be51b8e50..36bdf6379 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 {<JDK_ROOT>} 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 d164e1c56..2c1fb4def 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.