Merge remote-tracking branch 'origin/5.15.0' into 5.15

Change-Id: I247d77630e1cdb35883b143ca1ed69da7488181b

12 files changed, 192 insertions, 34 deletions

diff --git a/dist/changes-5.15.0 b/dist/changes-5.15.0
new file mode 100644
index 00000000..40076ce8
--- /dev/null
+++ b/dist/changes-5.15.0
@@ -0,0 +1,18 @@
+Qt 5.15 introduces many new features and improvements as well as bugfixes
+over the 5.14.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.15 series is binary compatible with the 5.14.x series.
+Applications compiled for 5.14 will continue to run with 5.15.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 8e17d435..75257c8e 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -251,6 +251,10 @@
     \title Android: Build Configuration Files
 */
 /*!
+    \externalpage https://developer.android.com/reference/android/app/Activity
+    \title Android: Activity
+*/
+/*!
     \externalpage https://developer.android.com/studio/build/dependencies
     \title Android: Add build dependencies
 */
@@ -263,10 +267,22 @@
     \title Android: Accessing original files
 */
 /*!
+    \externalpage https://developer.android.com/guide/components/fragments
+    \title Android: Fragments
+*/
+/*!
     \externalpage https://bugreports.qt.io/browse/QTBUG-81461
     \title QTBUG-81461
 */
 /*!
+    \externalpage https://bugreports.qt.io/browse/QTBUG-78009
+    \title QTBUG-78009
+*/
+/*!
+    \externalpage https://bugreports.qt.io/browse/QTBUG-72086
+    \title QTBUG-72086
+*/
+/*!
     \externalpage http://strawberryperl.com
     \title Perl
 */
@@ -364,6 +380,11 @@
 */
 
 /*!
+    \externalpage https://doc.qt.io/QtForMCUs
+    \title Qt for MCUs
+*/
+
+/*!
     \externalpage http://doc.qt.io/QtQuick2DRenderer
     \title Qt Quick 2D Renderer
 */
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 4d946e73..7793c8e4 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -190,8 +190,9 @@
     \snippet snippets/code/doc_src_i18n.cpp 8
 
     For a translation-aware application, a QTranslator object is created, then a
-    translation is loaded according to the current locale at runtime, and
-    finally, the translator object is installed into the application.
+    translation is loaded according to the user's preferred UI display locale at
+    runtime, and finally, the translator object is installed into the
+    application.
 
     \section1 Locating Qt Translations
 
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index b9fc4f83..9cc30f8c 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -36,6 +36,12 @@
 
     \section1 Qt 5.15.0
 
+    \section2 Qt 3D Module
+
+    \list
+        \li \l{Dear ImGui}{imgui} version v1.66b was added under MIT License.
+    \endlist
+
     \section2 Qt Core Module
 
     \list
@@ -43,6 +49,44 @@
         \li The copy of the \l{psl}{The Public Suffix List} got updated on 2020-03-13.
     \endlist
 
+    \section2 Qt DBUS Module
+
+    \l{libdbus-1-headers}{libdus-1 headers} got updated to upstream version 1.13.12
+
+    \section2 Qt GUI Module
+
+    \list
+        \li \l{libjpeg}{LibJPEG-turbo} got updated to upstream version 2.0.4.
+        \li Usage of \l{XCB-XInput} under MIT License is now documented.
+    \endlist
+
+    section2 Qt Image Formats
+
+    \l{libwebp}{WebP (libwebp)} got updated to upstream version 1.1.0.
+
+    \section2 Qt Location Module
+
+    \list
+        \li Use of \l{geosimplify-js polyline simplification library}{geosimplify.js} is now documented.
+    \endlist
+
+    \section2 Qt Quick3D Module
+
+    \list
+        \li Usage of \l{assimp}{Open Asset Import Library} got updated to upstream version 5.0.1.
+    \endlist
+
+    \section2 Qt Wayland Compositor
+
+    \list
+        \li \l{wayland-tablet-protocol}{Wayland Tablet Protocol} unstable v2, version 1 was added under the MIT License.
+        \li \l{wayland-xdg-decoration-protocol}{Wayland xdg-decoration Protocol} was updated to unstable v1, version 2
+        \li \l{wayland-xdg-shell-protocol}{Wayland XDG Shell Protocol} was updated to version 1.18
+        \li \l{wayland-text-input-unstable}{Wayland Text Input Protocol} was updated to unstable version v2
+        \li \l{wayland-linux-dmabuf-unstable-v1}{Wayland Linux Dmabuf Unstable V1 Protocol} was updated to unstable v1, version 3
+        \li \l{wayland-eglstream-controller}{Wayland EGLStream Controller Protocol} was updated to version 1.1.1
+    \endlist
+
     \section2 Qt WebEngine Module
     \list
         \li Updated Chromium to 80.0.3987
diff --git a/doc/src/platforms/android/android-deploying-application.qdoc b/doc/src/platforms/android/android-deploying-application.qdoc
index a9672979..796dcab0 100644
--- a/doc/src/platforms/android/android-deploying-application.qdoc
+++ b/doc/src/platforms/android/android-deploying-application.qdoc
@@ -96,8 +96,7 @@
     the following after running \c qmake or \c CMake:
 
     \code
-    export ANDROID_BUILD_DIR=$BUILD_DIR/android-build
-    make -j$(nproc) install INSTALL_ROOT=$ANDROID_BUILD_DIR
+    make -j$(nproc) apk_install_target
     \endcode
 
     The previous command copies the application's binaries and resources
@@ -244,8 +243,13 @@
 
     You can place any assets that are intended to be accessed by Java code under
     \c{$ANDROID_PACKAGE_SOURCE_DIR/assets/}. For more information on using assets
-    with Qt, see \l{Porting to Android}. However, to have the best integration
-    with Qt, it is recommended to use \l{The Qt Resource System}.
+    with Qt, see \l{Porting to Android}.
+
+    \note Using \l{The Qt Resource System} entails having \c{.qrc} files bundled
+        in the \c{.so} files which must be unpacked first to be loaded by the
+        linker, while the Android assets are compressed in the \e{.apk} and can
+        be directly used in your application. That means using the Android assets
+        can take up less space, but it's not a cross-platform solution with Qt.
 
     \section2 Android Libraries
 
@@ -304,9 +308,8 @@
     mkdir build-project
     cd build-project
     ~/Qt/5.15.0/android/bin/qmake ../project/project.pro
-    export ANDROID_BUILD_DIR=$(pwd)/android-build/
     make -j$(nproc)
-    make -j$(nproc) install INSTALL_ROOT=$ANDROID_BUILD_DIR
+    make -j$(nproc) apk_install_target
     \endcode
 
     \section2 Command Line Arguments
@@ -429,7 +432,21 @@
     it should be possible to run \l androiddeployqt on it with no modifications
     and get a working Qt for Android application.
 
-    However, there are a set of \c qmake variables that can be used to tailor
+    There are two important environment variables used by Qt:
+
+    \list
+        \li \c{ANDROID_SDK_ROOT}: specifies the path to the Android SDK used for
+            building the application. The Android SDK contains the build-tools,
+            Android NDK, and Android toolchains.
+        \li \c{ANDROID_NDK_ROOT}: specifies the path to the Android NDK used to
+            build the application. It is not recommended to hard-code this path,
+            since different Qt for Android versions can depend on different
+            Android NDK versions.
+    \endlist
+
+    \note Qt Creator sets these variables by default.
+
+    There are a set of \c qmake variables that can be used to tailor
     your package. At some point during development, you will most likely want
     to look into these variables to customize your application.
 
@@ -445,14 +462,13 @@
         \li \l{ANDROID_ABIS}
         \li \l{ANDROID_API_VERSION}
         \li \l{ANDROID_DEPLOYMENT_DEPENDENCIES}
-        \li \l{ANDROID_SDK_ROOT}
-        \li \l{ANDROID_NDK_ROOT}
         \li \l{ANDROID_MIN_SDK_VERSION}
         \li \l{ANDROID_TARGET_SDK_VERSION}
         \li \l{JAVA_HOME}
     \endlist
 
-    Also, the most useful \c qmake variable when writing a Qt module:
+    Also, the following \c qmake variables are primarily useful when writing a Qt module, and not
+    normal applications:
 
     \list
         \li \l{ANDROID_BUNDLED_JAR_DEPENDENCIES}
@@ -467,5 +483,5 @@
 
     Qt Creator runs the \l androiddeployqt tool by default, and provides easy
     and intuitive user interfaces to specify many of the options. For more
-    information, see \l{Qt Creator: Deploying Applications to Android Devices}{the Qt Creator documentation}.
+    information, see \l{Qt Creator: Deploying Applications to Android Devices}.
 */
diff --git a/doc/src/platforms/android/android-platform-notes.qdoc b/doc/src/platforms/android/android-platform-notes.qdoc
index 96878ea5..6dc339ff 100644
--- a/doc/src/platforms/android/android-platform-notes.qdoc
+++ b/doc/src/platforms/android/android-platform-notes.qdoc
@@ -120,4 +120,33 @@
     language like Japanese, with Gboard, only a QWERTY keyboard is displayed.
     This environment variable is queried each time the keyboard is displayed,
     so it's possible to toggle the workaround on and off, as necessary.
+
+    \section1 Limitations
+
+    Some of the Qt modules might have features that are not supported on Android
+    or have limitations. For more information, see \l{QTBUG-72086}.
+
+    \section1 Frequently Asked Questions
+
+    \list
+        \li Should I use \c QtActivity or \l{Android: Activity}{Android Activity}
+            to create a custom Activity?
+
+        \c QtActivity extends \c Activity and implements the logic needed to load
+        the Qt libraries or handle events and native calls between Android and Qt.
+        In general, extending \c QtActivity is needed if you are using any native
+        calls. Otherwise, extending \c Activity should work.
+
+        \li Should I use \c QtService or \l{Android: Service}{Android Service}?
+
+        The same reasoning as \c QtActivity applies here. Unless you are using
+        features that require the Qt libraries to be loaded, like native calls.
+
+        \li Can \l{Android: Fragments}{Android Fragments} be used with Qt? What is
+            the equivalent for Fragment in Qt?
+
+        Android Fragments cannot be used with Qt. However, Qt offers it's own modular
+        components and views with QML. You can combine multiple components in one
+        QML view. For more information, see \l{Qt QML}.
+    \endlist
 */
diff --git a/doc/src/platforms/android/android-services.qdoc b/doc/src/platforms/android/android-services.qdoc
index 65564c02..c16fba81 100644
--- a/doc/src/platforms/android/android-services.qdoc
+++ b/doc/src/platforms/android/android-services.qdoc
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
@@ -424,9 +424,6 @@ classObject.callMethod<void>("registerServiceBroadcastReceiver",
                              QtAndroid::androidContext().object());
 \endcode
 
-For more information, see the examples \l{Android Service with BroadcastReceiver},
-and \l{Android Service with BroadcastReceiver - Same Lib File}.
-
 \section2 Using Qt Remote Objects
 
 \l{Getting Started with Qt Remote Objects}{Qt Remote Objects} offers an easy way
@@ -519,17 +516,16 @@ on the debug logcat.
 \note The same method could be used when using the same \c .so lib file. For more
 information, see \l{Use the same .so Lib File}.
 
-For more information, see the examples \l{Android Service with Qt Remote Objects},
-and \l{Android Service with Qt Remote Objects - Same Lib File}.
-
 \section2 Using QAndroidBinder
 
 While using \l{QtRemoteObjects}{Qt Remote Objects} for communication is a
 cross-platform solution, \l QAndroidBinder Class Reference} is Android specific.
 \l QAndroidBinder is a convenience class that implements the most important
-methods in \l{Android: Binder}.
-It allows sending \l{QByteArray} or \l{QVariant} objcets between processes.
-For more information on how to use it with an Android Service, see
-\l{Android Service with QAndroidBinder}{Android Service with QAndroidBinder Example}.
+methods in \l{Android: Binder}. It allows sending \l{QByteArray} or \l{QVariant}
+objcets between processes.
+
+\note Qt for Android has a limitation forcing the execution of only one service
+    at a time when running multiple services in one process. Thus, it is recommended
+    to run each service in its own process. For more information, see \l{QTBUG-78009}.
 
 */
diff --git a/doc/src/platforms/macos.qdoc b/doc/src/platforms/macos.qdoc
index 01836dc3..c213a679 100644
--- a/doc/src/platforms/macos.qdoc
+++ b/doc/src/platforms/macos.qdoc
@@ -1227,6 +1227,15 @@
         \li \c{-codesign=<ident>}
         \li Run \c codesign with the given identity on all executables
     \row
+        \li \c{-hardened-runtime}
+        \li Enable Hardened Runtime when code signing
+    \row
+        \li \c{-timestamp}
+        \li Include a secure timestamp when code signing (requires internet connection)
+    \row
+        \li \c{-sign-for-notarization=<ident>}
+        \li Activate the necessary options for notarization (requires internet connection). The activated options are \c{-hardened-runtime}, \c{-timestamp} and \c{-codesign=<ident>}
+    \row
         \li \c{-appstore-compliant}
         \li Skip deployment of components that use private API
     \row
diff --git a/doc/src/platforms/vxworks.qdoc b/doc/src/platforms/vxworks.qdoc
index 8f76e4ad..511aac2b 100644
--- a/doc/src/platforms/vxworks.qdoc
+++ b/doc/src/platforms/vxworks.qdoc
@@ -39,8 +39,15 @@
 
   \section1 Supported Architectures and VxWorks Releases
 
-  Qt 5.5 is currently tested and supported on VxWorks 7 release SR0480 2016-09-16.
-  Supported architecture is ARM-v7.
+  \list
+    \li Qt 5.5 was verified on VxWorks 7 release SR0480 2016-09-16.
+    Supported architecture is ARM-v7.
+    \note Qt 5.5 is no longer supported.
+    \li Qt 5.9 LTS was verified on VxWorks 7 SR0541.
+    \note Support for Qt 5.9 ends May 2020.
+    \li 5.12 LTS is verified on VxWorks 7 SR0541. Qt 5.12 is supported until
+    December 2021.
+  \endlist
 
   If you are interested in later Qt releases, please \l {https://www.qt.io/contact-us/}{contact} Qt professional services.
 
@@ -48,6 +55,10 @@
 
   Qt for VxWorks is delivered via the \l {Qt Account}, under the name
   \b {Qt 5.5.1} > \b {Qt VxWorks Platform Source Package}.
+  \note Qt 5.5 is no longer supported.
+
+  Source packages for up-to-date and supported Qt releases on VxWorks are
+  available through Qt Professional Services.
 
   \section1 Requirements for VxWorks
 
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 8d2a0138..9468cfb2 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -384,6 +384,12 @@
         \li All
         \li UI Components for creating stunning 3D data visualizations.
     \row
+        \li \l{Qt Lottie Animation}
+        \li All
+        \li All
+        \li A QML API for rendering graphics and animations in JSON format,
+            exported by the \l Bodymovin plugin for Adobe® After Effects.
+    \row
         \li \l[QtNetworkAuth]{Qt Network Authorization}
         \li All
         \li All
@@ -402,6 +408,12 @@
         \li Web browsers with WebAssembly support
         \li A platform target to compile Qt applications for the web browsers using WebAssembly.
     \row
+        \li \l[QtQuick3D]{Qt Quick 3D}
+        \li All
+        \li All
+        \li Provides a high-level API for creating 3D content or UIs based on
+            Qt Quick.
+    \row
         \li \l {Qt Quick WebGL}
         \li All
         \li WebGL-enabled web browsers
@@ -436,6 +448,11 @@
     \row \li \l{Qt for Device Creation}
          \li Tools for fast, easy, and fully-integrated embedded device application development.
              Included in most other value-add solutions.
+    \row \li \l{Qt for MCUs}
+         \li Offers a complete graphics framework and toolkit with everything
+             needed to design, develop, and deploy GUIs on microcontroller
+             units (MCUs). Applications can run either on bare metal or on a
+             real-time operating system.
     \endtable
 
     \section1 Technology Preview Features
@@ -448,13 +465,8 @@
         \li Feature
         \li Description
     \row
-        \li \l{Qt Lottie Animation} (Technology Preview)
-        \li A QML API for rendering graphics and animations in JSON format,
-            exported by the \l Bodymovin plugin for Adobe® After Effects.
-    \row
-        \li \l[QtQuick3D]{Qt Quick 3D} (Technology Preview)
-        \li Qt Quick 3D provides a high-level API for creating 3D content or UIs based on
-            Qt Quick.
+        \li \l{Qt PDF} (Technology Preview)
+        \li Provides C++ and QML APIs for rendering PDF documents.
     \endtable
 
     \section1 Qt Tools
diff --git a/doc/src/snippets/code/doc_src_i18n.cpp b/doc/src/snippets/code/doc_src_i18n.cpp
index 18a5def1..2bd80d5a 100644
--- a/doc/src/snippets/code/doc_src_i18n.cpp
+++ b/doc/src/snippets/code/doc_src_i18n.cpp
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     QTranslator myappTranslator;
-    myappTranslator.load("myapp_" + QLocale::system().name());
+    myappTranslator.load(QLocale(), QLatin1String("myapp"), QLatin1String("_"), QLatin1String(":/i18n"));
     app.installTranslator(&myappTranslator);
 
     return app.exec();
diff --git a/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp b/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp
index f2c2d198..a0073c5d 100644
--- a/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp
+++ b/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp
@@ -110,6 +110,7 @@ static int setup_unix_signal_handlers()
 
     term.sa_handler = MyDaemon::termSignalHandler;
     sigemptyset(&term.sa_mask);
+    term.sa_flags = 0;
     term.sa_flags |= SA_RESTART;
 
     if (sigaction(SIGTERM, &term, 0))