Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensourcev5.15.4-lts-lgpl

Change-Id: Ide8c1c3b52cb451bdff85cbf8e4fcdadb0cf3ae1

9 files changed, 42 insertions, 13 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 2b92eda5a..b79218719 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.4
diff --git a/doc/src/development/rcc.qdoc b/doc/src/development/rcc.qdoc
index 054df4b4d..db2d9cb96 100644
--- a/doc/src/development/rcc.qdoc
+++ b/doc/src/development/rcc.qdoc
@@ -107,7 +107,7 @@
     \row \li \c{-project} \li \li Output a resource file containing all files from the
                                   current directory.
 
-    \row \li \c{--format-version \li \c{<number>} \li The RCC format version to write.
+    \row \li \c{--format-version} \li \c{<number>} \li The RCC format version to write.
 
     \endtable
 
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index d983ecb13..687830443 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -276,6 +276,14 @@
     \title Android: Fragments
 */
 /*!
+    \externalpage https://developer.android.com/reference/androidx/core/app/JobIntentService.html
+    \title Android: JobIntentService
+*/
+/*!
+    \externalpage https://developer.android.com/guide/components/foreground-services
+    \title Android: Foreground services
+*/
+/*!
     \externalpage https://bugreports.qt.io/browse/QTBUG-81461
     \title QTBUG-81461
 */
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 0102f7113..80fee5f94 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -82,7 +82,7 @@
     The following YouTube video gives a complete walk-through of the
     installation process:
 
-    \youtube I5jasWrsxT0
+    \youtube wPcVlP_wrew
 
     \section2 Updating or Removing Qt
 
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index 4a3f1e667..83d46fc6f 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -34,6 +34,25 @@
     Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
     released with Qt that are relevant to licensing.
 
+    \section1 Qt 5.15.4
+
+    \section2 Qt GUI Module
+
+    \l{libjpeg}{LibJPEG-turbo} got updated to upstream version 2.0.6.
+    Also, the copyright information got updated.
+
+    \section2 Qt Image Formats
+
+    \list
+        \li \l{libtiff}{TIFF Software Distribution (libtiff)} got updated to upstream
+        version 4.2.0.
+        \li \l{libwebp}{WebP (libwebp)} got updated to upstream version 1.2.0.
+    \endlist
+
+    \section2 Qt SQL Module
+
+    \l{sqlite}{SQLite} got updated to upstream version 3.35.2.
+
     \section1 Qt 5.15.3
 
     \section2 Qt Core Module
diff --git a/doc/src/platforms/android/android-services.qdoc b/doc/src/platforms/android/android-services.qdoc
index c16fba81d..bcaba1556 100644
--- a/doc/src/platforms/android/android-services.qdoc
+++ b/doc/src/platforms/android/android-services.qdoc
@@ -140,7 +140,7 @@ Create a custom Java class:
 public class QtBootServiceBroadcastReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        Intent startServiceIntent = new Intent(context, QtBootServiceBroadcastReceiver.class);
+        Intent startServiceIntent = new Intent(context, QtAndroidService.class);
         context.startService(startServiceIntent);
     }
 }
@@ -163,8 +163,10 @@ Also, add the \c receiver definition in the body of the \c <application> section
 </receiver>
 \endcode
 
-\note To run a service at boot time, it has to be defined as a separate process,
-see \l{Service in Separate Process}.
+\note Android 8.0 introduced some limitations on running background services,
+which means using a nomal \c Service class might not work. For more information,
+see Android's recommendation to use either \c {Android: Foreground services}{Foreground services}
+or \l {Android: JobIntentService}{JobIntentService}.
 
 \section2 Manage the Service in AndroidMnifest.xml
 
diff --git a/doc/src/platforms/android/android.qdoc b/doc/src/platforms/android/android.qdoc
index 13a7ab207..576056f17 100644
--- a/doc/src/platforms/android/android.qdoc
+++ b/doc/src/platforms/android/android.qdoc
@@ -158,7 +158,7 @@ Different Qt versions depend on different NDK versions, as listed below:
         \li \e GCC toolchain
 \endtable
 
-\li \note Qt 5.14.0 and 5.14.1 with NDK r21 have a bug fixed at \l {QTBUG-81461}.
+\note Qt 5.14.0 and 5.14.1 with NDK r21 have a bug fixed at \l {QTBUG-81461}.
 
 \note Make sure to unpack the Android SDK and NDK to a writeable location that Qt Creator
 can access later. Otherwise, Qt Creator won't be able to use \c sdkmanager or find all
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 2fd6f241e..073a6199f 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -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.5.0}, \b {ICC 19.1}
+        \li GCC 5 or later, \b {GCC 7}, \b {ICC 19.1}
         \li
     \row \li SUSE Linux Enterprise Server
         \li \c x86_64
-        \li GCC 5 or later, \b {GCC 10.2.1}
+        \li GCC 5 or later, \b {GCC 10}
         \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.3.0}
+        \li GCC 5 or later, \b {GCC 9}
         \li
     \row \li Generic Linux
         \li \c x86 and \c x86_64
diff --git a/doc/src/platforms/webasm.qdoc b/doc/src/platforms/webasm.qdoc
index 586d35de7..5d51fa5e7 100644
--- a/doc/src/platforms/webasm.qdoc
+++ b/doc/src/platforms/webasm.qdoc
@@ -199,7 +199,7 @@ You can test-run your application in the following way:
 
 The most important limitation is that the Qt build is static.
 
-For further info, refer to \l{qtwebassembly-platform-notes}
+For further info, refer to \l {Qt WebAssembly Platform Notes}.
 
 \section1 External resources