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

Qt 5.15.9-lts-lgpl release

14 files changed, 106 insertions, 55 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 2e7b67b1..d64cb888 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.15.8
+MODULE_VERSION = 5.15.9
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 1d033139..5ff64c35 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -31,7 +31,7 @@
     \brief A tutorial for Qt Quick based on an alarms application.
 
     This tutorial shows how to develop a simple alarm application as
-    an introduction to Qt Quick and Qt Quick Controls2.
+    an introduction to Qt Quick and Qt Quick Controls.
 
     This application is similar to the alarm application usually
     found on an Android phone. Its features let you enter, edit,
@@ -65,6 +65,9 @@
     The latter two files are included with the source code for this
     tutorial.
 
+    \note The UI text in Qt Creator and the contents of the generated files
+    depend on the Qt Creator version that you use.
+
     \section1 Qt Creator
 
     Setting up a new project in Qt Creator is aided by a wizard that
@@ -73,12 +76,12 @@
     type of project and creates the project for you.
 
     To create the Alarms project, select \uicontrol{File} >
-    \uicontrol{New File or Project} > \uicontrol{Application} >
-    \uicontrol{Qt Quick Application - Empty} > \uicontrol{Choose}.
-    Type "alarms" in the \b{Name} field, and follow the instructions
+    \uicontrol{New Project} > \uicontrol{Application (Qt)} >
+    \uicontrol{Qt Quick Application} > \uicontrol{Choose}.
+    Type \e alarms in the \uicontrol{Name} field, and follow the instructions
     of the wizard.
 
-    \image alarms2.png "Qt Creator New File or Project dialog"
+    \image alarms2.png "Qt Creator New Project dialog"
 
     \image alarms3.png "Project Location"
 
@@ -90,15 +93,16 @@
             \li Source file
             \li Purpose
         \row
-            \li alarms.pro
+            \li CMakeLists.txt
             \li The project file
         \row
             \li main.cpp
             \li The main C++ code file for the application.
-        \row
-            \li qml.qrc
-            \li The resource file, which contains the names of the
-            source files, except main.cpp and the project file.
+       \row
+           \li main.qml
+           \li The main QML code file for the application. We will instantiate
+               our custom QML types (\c AlarmDialog, \c AlarmModel,
+               \c AlarmDelegate, and \c TumblerDelegate) in this file.
     \endtable
 
     The wizard generates the code in the main.cpp file below.
@@ -119,10 +123,6 @@
            \li \c qtquickcontrols2.conf
            \li Selects the \c Material style with the \c Dark theme.
        \row
-           \li \c main.qml
-           \li The QML code that links AlarmDialog.qml, AlarmModel.qml,
-               AlarmDelegate.qml and TumblerDelegate.qml
-       \row
            \li \c AlarmDialog.qml
            \li Defines the dialog for adding new alarms.
        \row
@@ -133,7 +133,11 @@
            \li Defines the ListModel used for storing the alarms' data.
        \row
            \li \c TumblerDelegate.qml
-           \li Defines the graphical layout of the Tumblers
+           \li Defines the graphical layout of the Tumblers.
+        \row
+            \li \c qml.qrc
+            \li The resource file, which contains the names of the
+                source files, except main.cpp and the project file.
     \endtable
 
 
diff --git a/doc/src/images/alarms2.png b/doc/src/images/alarms2.png
index dbcb852c..a81a36d2 100644
--- a/doc/src/images/alarms2.png
+++ b/doc/src/images/alarms2.png
diff --git a/doc/src/images/alarms3.png b/doc/src/images/alarms3.png
index 48abec6a..d680a4ed 100644
--- a/doc/src/images/alarms3.png
+++ b/doc/src/images/alarms3.png
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index cc0abccf..17554d10 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -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.9
+
+    \section2 Qt Core Module
+
+    \list
+        \li The copy of the \l{psl}{The Public Suffix List} was updated on 2022-02-17.
+        \li \l{zlib}{Data Compression Library (zlib)} was updated to version 1.2.12.
+    \endlist
+
+    \section2 Qt GUI Module
+
+    \l{libjpeg}{LibJPEG-turbo} was updated to upstream version 2.1.3.
+
+    \section2 Qt Image Formats
+
+    \li \l{libwebp}{WebP (libwebp)} was updated to upstream version 1.2.2.
+
+    \section2 Qt SQL Module
+
+    \l{sqlite}{SQLite} was updated to upstream version 3.37.2.
+
     \section1 Qt 5.15.8
 
     \section2 Qt Core Module
diff --git a/doc/src/platforms/macos.qdoc b/doc/src/platforms/macos.qdoc
index c213a679..f07df304 100644
--- a/doc/src/platforms/macos.qdoc
+++ b/doc/src/platforms/macos.qdoc
@@ -145,17 +145,24 @@
 
     \section2 Architectures
 
-    By default, Qt is built for x86_64. To build for x86_64h (Haswell). use the
-    \c QMAKE_APPLE_DEVICE_ARCHS \c qmake variable.
-    This is selectable at configure time:
+    By default, Qt will build for the architecture of your development machine -
+    either \c x86_64, or \c arm64 if you are on an Apple Silicon Mac.
+
+    To build for other architectures you can use the \c QMAKE_APPLE_DEVICE_ARCHS variables
+    in your project files or on the command line. This allows you to both cross-compile
+    to a different architecture, and to build universal (multi-architecture) binaries.
+    For example, to build your application for both \c x86_64 and \c arm64:
+
     \code
-    ./configure -platform macx-clang QMAKE_APPLE_DEVICE_ARCHS=x86_64h
+    qmake ~/src/myapp QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64"
     \endcode
 
-    \c QMAKE_APPLE_DEVICE_ARCHS can also be specified as a space-delimited list
-    in order to build for multiple architectures simultaneously:
+    When specifying the architectures in a project file they should not be quoted, e.g.:
+
     \code
-    ./configure -platform macx-clang QMAKE_APPLE_DEVICE_ARCHS="x86_64 x86_64h"
+    TEMPLATE = app
+    SOURCES = main.cpp
+    QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
     \endcode
 
     \section1 Additional Command-Line Options
diff --git a/doc/src/platforms/qnx.qdoc b/doc/src/platforms/qnx.qdoc
index 73561252..0c12f1a2 100644
--- a/doc/src/platforms/qnx.qdoc
+++ b/doc/src/platforms/qnx.qdoc
@@ -40,15 +40,16 @@
     QNX SDP (Software Development Platform) which includes QNX Neutrino RTOS
     components for various targets and a full set of development tools.
 
-    Qt 5 is currently tested and supported on QNX SDP 7.0, with support for
-    both 32-bit and 64-bit target architectures:
+    Qt 5 is currently tested and supported on QNX SDP 7.0 and 7.1, with support for
+    the following target architectures:
 
     \list
-        \li \c ARMle-v7 and \c x86 (32-bit)
-        \li \c AArch64le and \c x86-64 (64-bit)
+        \li \c (32-bit) ARMle-v7 and \c x86 (QNX 7.0 only)
+        \li \c (64-bit) AArch64le and \c x86-64
     \endlist
 
-    Support for 64-bit architectures was added in QNX SDP 7.0.
+    \note Support for 64-bit architectures was added in QNX SDP 7.0. Support for
+          32-bit x86 architecture was removed in QNX SDP 7.1.
 
     \section2 Previous Releases
 
@@ -86,14 +87,12 @@
 
     \section1 Build Requirements
 
-    Building Qt 5 requires the following packages available from the
-    \l {http://www.qnx.com/}{QNX website} (registration required for access
-    to downloads):
+    Building Qt 5 requires downloading, and installing of, QNX SDP 7.0 or 7.1
+    from the
+    \l {http://www.qnx.com/}{QNX website}.
 
-    \list
-        \li \l {http://blackberry.qnx.com/en/sdp7/sdp70_download}{QNX SDP 7.0}
-            with \l {http://www.qnx.com/download/group.html?programid=26808}
-    \endlist
+    \note A suitable license is required. Contact (\l {mailto://info@qnx.com}{QNX}
+          for more information.
 
     The compiler and other parts of the tool chain are provided in the SDP
     packages. You do not need any additional installations on your host PC.
@@ -299,6 +298,8 @@
 
     \section1 Qt Creator Target Requirements
 
+    \note Qt Creator support has been tested with QNX 7.0 only.
+
     A QNX Neutrino RTOS target used for development with Qt Creator should
     provide a few additional command line tools and services.
 
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 1edb4c7f..acacdf87 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -43,6 +43,10 @@
         \li \c x86_64
         \li GCC 5 or later, \b {GCC 10}
         \li
+    \row \li Red Hat Enterprise Linux 8.4
+        \li \c x86_64
+        \li \b {GCC 10.1 via gcc-toolset-10}
+        \li
     \row \li Red Hat Enterprise Linux 7.6
         \li \c x86_64
         \li \b {GCC 5.3.1 via devtoolset-4}
@@ -63,8 +67,8 @@
 \table 80%
     \header \li Target Platform \li Architecture \li Build Environment
     \row \li \macos 10.13, \macos 10.14, \macos 10.15, \macos 11
-        \li \c x86_64 and \c x86_64h
-        \li Xcode 11 or \b {Xcode 12} (11 SDK)
+        \li \c x86_64 and \c x86_64h and \c arm64
+        \li Xcode 11 or Xcode 12 or \b {Xcode 13} (12 SDK)
 \endtable
 //! [macos]
 
@@ -72,7 +76,11 @@
 //! [windows]
 \table 80%
     \header \li Operating System \li Architecture \li Compiler \li Notes
-    \row \li Windows 10
+    \row \li Windows 11 21H2
+        \li \c x86 and \c x86_64
+        \li {MSVC 2019}
+        \li
+    \row \li Windows 10 21H2
         \li \c x86 and \c x86_64
         \li \b {MSVC 2019}, MSVC 2017, MSVC 2015, MinGW 8.1
         \li
@@ -100,7 +108,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.15}, \b {Windows 10 (x86_64)}
+        \li {RHEL 8.x (x86_64)}, \b {RHEL 7.x (x86_64)}, \b{\macos 10.15}, \b {Windows 10 (x86_64)}
 \endtable
 //! [android]
 
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 651083a8..cb67bd52 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -75,12 +75,11 @@
 
     \section2 Visual Studio Tools
 
-    The \l {Qt VS Tools} allows programmers to create, build, debug
-    and run Qt applications from within non-Express versions of Microsoft Visual Studio
-    2013 and later. The add-in contains project wizards, Qt project import/export
-    support, integrated Qt resource manager and automated build setup for
-    the Qt Meta-Object Compiler, User Interface Compiler, and Resource
-    Compiler.
+    \l {Qt VS Tools} enables programmers to create, build, debug, and run
+    Qt applications from Microsoft Visual Studio. It contains project wizards,
+    Qt project import and export support, integrated Qt resource manager,
+    and automated build setup for the Qt Meta-Object Compiler, User Interface
+    Compiler, and Resource Compiler.
 
 */
 
diff --git a/doc/src/qmlapp/firststepsqml.qdoc b/doc/src/qmlapp/firststepsqml.qdoc
index 6a676a0c..bdeb0bff 100644
--- a/doc/src/qmlapp/firststepsqml.qdoc
+++ b/doc/src/qmlapp/firststepsqml.qdoc
@@ -268,12 +268,14 @@ Rectangle {
     Rectangle {
         width: parent.width / 2
         height: parent.height
+        color: "blue"
     }
 
     Rectangle {
         width: parent.width / 2
         height: parent.height
         x: parent.width / 2
+        color: "green"
     }
 }
 \endqml
diff --git a/examples/tutorials/alarms/alarms.pro b/examples/tutorials/alarms/alarms.pro
index 14fc29a8..4e75fa52 100644
--- a/examples/tutorials/alarms/alarms.pro
+++ b/examples/tutorials/alarms/alarms.pro
@@ -4,7 +4,7 @@ QT += quick
 
 SOURCES += main.cpp
 
-RESOURCES += qml.qrc
+RESOURCES += qml.qrc controls_conf.qrc
 
 target.path = $$[QT_INSTALL_EXAMPLES]/demos/alarms
 INSTALLS += target
diff --git a/examples/tutorials/alarms/controls_conf.qrc b/examples/tutorials/alarms/controls_conf.qrc
new file mode 100644
index 00000000..4fbf17b7
--- /dev/null
+++ b/examples/tutorials/alarms/controls_conf.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qtquickcontrols2.conf</file>
+    </qresource>
+</RCC>
diff --git a/examples/tutorials/alarms/main.cpp b/examples/tutorials/alarms/main.cpp
index 3e1bdd84..04d2f8dc 100644
--- a/examples/tutorials/alarms/main.cpp
+++ b/examples/tutorials/alarms/main.cpp
@@ -57,9 +57,14 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
-    if (engine.rootObjects().isEmpty())
-        return -1;
+    const QUrl url(u"qrc:/alarms/main.qml"_qs);
+    QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, &app,
+                     [url](QObject *obj, const QUrl &objUrl) {
+                         if (!obj && url == objUrl)
+                             QCoreApplication::exit(-1);
+                     },
+                     Qt::QueuedConnection);
+    engine.load(url);
 
     return app.exec();
 }
diff --git a/examples/tutorials/alarms/qml.qrc b/examples/tutorials/alarms/qml.qrc
index ae9ac907..270febb2 100644
--- a/examples/tutorials/alarms/qml.qrc
+++ b/examples/tutorials/alarms/qml.qrc
@@ -1,7 +1,6 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/alarms/">
         <file>main.qml</file>
-        <file>qtquickcontrols2.conf</file>
         <file>TumblerDelegate.qml</file>
         <file>AlarmModel.qml</file>
         <file>AlarmDelegate.qml</file>