Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl

Change-Id: I75bc374ac8ab284d6c0b046cb7c7ea2a2da82710

8 files changed, 59 insertions, 56 deletions

diff --git a/.qmake.conf b/.qmake.conf
index d64cb888f..9d930cebc 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.15.9
+MODULE_VERSION = 5.15.10
diff --git a/doc/src/development/debug.qdoc b/doc/src/development/debug.qdoc
index 32d09b541..ad26997a3 100644
--- a/doc/src/development/debug.qdoc
+++ b/doc/src/development/debug.qdoc
@@ -123,18 +123,29 @@
 
     \section1 Warning and Debugging Messages
 
-    Qt includes global macros for writing out warning and debug
-    text. You can use them for the following purposes:
+    Qt includes global C++ macros for writing out warning and debug text.
+    The plain macros use a default \l {QLoggingCategory}{logging category};
+    the categorized logging macros allow you to specify the category.
+    You can use them for the following purposes:
 
-    \list
-    \li qDebug() is used for writing custom debug output.
-    \li qInfo() is used for informational messages.
-    \li qWarning() is used to report warnings and recoverable errors in
-       your application.
-    \li qCritical() is used for writing critical error messages and
-       reporting system errors.
-    \li qFatal() is used for writing fatal error messages shortly before exiting.
-    \endlist
+    \table
+    \header \li Plain macro \li Categorized macro \li Purpose
+    \row \li qDebug()
+         \li qCDebug()
+         \li Used for writing custom debug output
+    \row \li qInfo()
+         \li qCInfo()
+         \li Used for informational messages
+    \row \li qWarning()
+         \li qCWarning()
+         \li Used to report warnings and recoverable errors in your application or library
+    \row \li qCritical()
+         \li qCCritical()
+         \li Used for writing critical error messages and reporting system errors
+    \row \li qFatal()
+         \li -
+         \li Used for writing messages about fatal errors shortly before exiting
+    \endtable
 
     If you include the <QtDebug> header file, the \c qDebug() macro
     can also be used as an output stream. For example:
@@ -150,7 +161,7 @@
     by setting the \c QT_MESSAGE_PATTERN environment variable. For example:
 
     \code
-    QT_MESSAGE_PATTERN="[%{type}] %{appname} (%{file}:%{line}) - %{message}"
+    QT_MESSAGE_PATTERN="[%{time process} %{type}] %{appname} %{category} %{function} - %{message}"
     \endcode
 
     The format is documented in qSetMessagePattern(). You can also install your
@@ -169,6 +180,8 @@
     looks or acts strangely. More useful if you use \l{QObject::setObjectName()}{object names}
     than not, but often useful even without names.
 
+    In QML, \l {QtQuick::Item::}{dumpItemTree()} serves the same purpose.
+
     \section1 Providing Support for the qDebug() Stream Operator
 
     You can implement the stream operator used by qDebug() to provide
@@ -224,6 +237,9 @@
     therefore recommend that you use a debug version of Qt when
     developing Qt-based software.
 
+    Logging and \l {LoggingCategory}{categorized logging} are also
+    possible in \l {Debugging QML Applications}{QML}.
+
     \section1 Common Bugs
 
     There is one bug that is so common that it deserves mention here:
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index 17554d10f..174ec19be 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -34,6 +34,12 @@
     Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
     released with Qt that are relevant to licensing.
 
+    \section1 Qt 5.15.10
+
+    \section2 Qt Core Module
+
+    \l{pcre2}{PCRE2} was updated to version 10.40.
+
     \section1 Qt 5.15.9
 
     \section2 Qt Core Module
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index 8a50d1d3b..995ad30ab 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -30,33 +30,17 @@
 
     \title Trademarks
     \ingroup licensing
-    \brief Information about trademarks owned by The Qt Company and other organizations.
+    \brief Information about trademarks owned by The Qt Company.
 
     The Qt Company Ltd and/or its subsidiaries are the owner of Qt trademarks worldwide.
 
     \list
-    \li Digia and the Digia logo are trademarks of Digia Plc and/or its subsidiaries
-        in Finland and other countries.
-    \li Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of
-       Intel Corporation in the United States, other countries, or both.
-    \li Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-       Other names may be trademarks of their respective owners.
-    \li Linux is a \reg trademark of Linus Torvalds in the United States, other
-       countries or both.
-    \li Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc.,
-       registered in the U.S. and other countries.
-    \li Microsoft, Windows, Windows NT, XP, Windows Vista, Visual Studio, ActiveX
-       and the Windows logo are \reg trademarks of Microsoft Corporation in the
-       United States, other countries, or both.
-    \li Motif is a registered trademark of The Open Group in the United States,
-       other countries, or both.
-    \li OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States
-       and other countries.
-    \li UNIX is a registered trademark of The Open Group in the United States
-       and other countries.
+    \li The Qt logo as well as Qt\reg, Qt Quick\reg, Built with Qt\reg, Boot to Qt\reg,
+        Qt Quick Compiler\reg, Qt Enterprise\reg, Qt Mobile\reg, and Qt Embedded\reg
+        are registered trademarks of The Qt Company Ltd.
     \li All other company, product, or service names may be trademarks or
        service marks of others and are the property of their respective owners.
-       The use of the word partner does not imply a partnership relationship
-       between Digia and any other company.
+       The use of the word \e partner does not imply a partnership relationship
+       between The Qt Company and any other company.
     \endlist
 */
diff --git a/doc/src/platforms/android/android-services.qdoc b/doc/src/platforms/android/android-services.qdoc
index 7436b1958..a0d0a430f 100644
--- a/doc/src/platforms/android/android-services.qdoc
+++ b/doc/src/platforms/android/android-services.qdoc
@@ -156,7 +156,7 @@ the \c AndroidManifest.xml file:
 Also, add the \c receiver definition in the body of the \c <application> section:
 
 \badcode
-<receiver android:name=".QtBootServiceBroadcastReceiver">
+<receiver android:name=".QtBootServiceBroadcastReceiver" android:exported="true">
     <intent-filter>
         <action android:name="android.intent.action.BOOT_COMPLETED" />
     </intent-filter>
@@ -178,7 +178,7 @@ For the service to be usable in an Android app, you must declare it in the
         service. Add the following inside the \c <application> section:
 
         \badcode
-        <service android:name=".QtAndroidService">
+        <service android:name=".QtAndroidService" android:exported="true">
             <!-- Background running -->
             <meta-data android:name="android.app.background_running" android:value="true"/>
             <!-- Background running -->
@@ -201,8 +201,7 @@ For the service to be usable in an Android app, you must declare it in the
         \c <activity> section for \c QtActivity. Add the following:
 
         \badcode
-        <service android:process=":qt_service" android:name=".QtAndroidService">
-
+        <service android:process=":qt_service" android:name=".QtAndroidService" android:exported="true">
             <meta-data android:name="android.app.lib_name" android:value="service"/>
             <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
             <meta-data android:name="android.app.repository" android:value="default"/>
@@ -243,7 +242,7 @@ To run a service in the same process as QtActivity, declare the service header
 as follows:
 
 \badcode
-<service android:name=".QtAndroidService">
+<service android:name=".QtAndroidService" android:exported="true">
 \endcode
 
 \section3 Service in Separate Process
@@ -251,7 +250,7 @@ as follows:
 To run a service in a dedicated process, declare the service header as follows:
 
 \badcode
-<service android:process=":qt_service" android:name=".QtAndroidService">
+<service android:process=":qt_service" android:name=".QtAndroidService" android:exported="true">
 \endcode
 
 Qt loads the \c .so file defined in \c android.app.lib_name \c meta-data,
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 1090f0e8f..dda1fda16 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -65,13 +65,12 @@
 
     \section1 Reference Configurations
 
-    The reference configurations are run on the continuous integration (CI)
-    system within Qt Project. In addition, they are subjected to unit test suite
-    and other internal testing tools on a frequent basis (prior to new version
-    releases, source tree branching, and at other significant period points in
-    the development process). Errors or bugs discovered in these platforms are
-    prioritized for correction. Significant errors discovered in tested
-    configurations can impact release dates.
+    Reference configurations are the primary focus of development. They are subjected
+    to unit test suite and other internal testing tools on a frequent basis (prior to
+    new version releases, source tree branching, and at other significant period points
+    in the development process). Errors or bugs discovered in these platforms are
+    prioritized for correction. Significant errors discovered in tested configurations
+    can impact release dates.
 
     Any configurations not listed above are not actively tested by the Qt
     Project. However, Qt may run on configurations other than those actively
@@ -80,10 +79,6 @@
     state for that particular configuration. The reference configurations are
     subject to change during the lifetime of a Qt release.
 
-    Details of the reference configurations are stored as \e {provisioning scripts}
-    in the \l {https://code.qt.io/cgit/qt/qt5.git/tree/coin?h=\qtver}
-    {qt5 Git repository}.
-
     The Qt Company provides support for the officially supported platforms and
     configurations. The Qt Company, Qt partners, open source projects and community
     users are also able to provide assistance with various different platforms and
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index acacdf873..90c93a3dd 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -66,7 +66,7 @@
 //! [macos]
 \table 80%
     \header \li Target Platform \li Architecture \li Build Environment
-    \row \li \macos 10.13, \macos 10.14, \macos 10.15, \macos 11
+    \row \li \macos 10.13, \macos 10.14, \macos 10.15, \macos 11, \macos 12
         \li \c x86_64 and \c x86_64h and \c arm64
         \li Xcode 11 or Xcode 12 or \b {Xcode 13} (12 SDK)
 \endtable
@@ -82,7 +82,7 @@
         \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 MSVC 2022, \b {MSVC 2019}, MSVC 2017, MSVC 2015, MinGW 8.1
         \li
     \row \li Windows 8.1
         \li \c x86 and \c x86_64
@@ -108,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 {RHEL 8.x (x86_64)}, \b {RHEL 7.x (x86_64)}, \b{\macos 10.15}, \b {Windows 10 (x86_64)}
+        \li \b {RHEL 8.x (x86_64)}, \b {RHEL 7.x (x86_64)}, \b{\macos 10.15}, \b {Windows 10 21H2 (x86_64)}
 \endtable
 //! [android]
 
diff --git a/doc/src/qmlapp/debugging.qdoc b/doc/src/qmlapp/debugging.qdoc
index 5b748b435..b0aa19526 100644
--- a/doc/src/qmlapp/debugging.qdoc
+++ b/doc/src/qmlapp/debugging.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 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.
@@ -145,6 +145,9 @@ may face. The sections below describe the debugging tools available and how to u
             JavaScript execution at the point where it is called.
 \endtable
 
+Alternatively, a \l {QLoggingCategory}{logging category} can be passed as the
+first argument to any of these \c {console} functions. See \l [QML] LoggingCategory for more details.
+
 \section1 Debugging Module Imports
 
 Set the \c QML_IMPORT_TRACE environment variable to enable debug output from QML's import loading