Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl

Change-Id: I6845108dc16125f21d5f23e1c18047f2bdfac101

4 files changed, 37 insertions, 7 deletions

diff --git a/.qmake.conf b/.qmake.conf
index b79218719..c9b2fcc13 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.15.4
+MODULE_VERSION = 5.15.5
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index 83d46fc6f..2122321cf 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -34,6 +34,21 @@
     Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
     released with Qt that are relevant to licensing.
 
+    \section1 Qt 5.15.5
+
+    \section2 Qt Core Module
+
+    \l{pcre2}{PCRE2} got updated to upstream version 10.37.
+
+    \section2 Qt GUI Module
+
+    \l{libjpeg}{LibJPEG-turbo} got updated to upstream version 2.1.0.
+    Also, the copyright information got updated.
+
+    \section2 Qt SQL Module
+
+    \l{sqlite}{SQLite} got updated to upstream version 3.35.5.
+
     \section1 Qt 5.15.4
 
     \section2 Qt GUI Module
diff --git a/doc/src/platforms/vxworks.qdoc b/doc/src/platforms/vxworks.qdoc
index 511aac2b5..551359926 100644
--- a/doc/src/platforms/vxworks.qdoc
+++ b/doc/src/platforms/vxworks.qdoc
@@ -45,7 +45,7 @@
     \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
+    \li 5.12 LTS is verified on VxWorks 7 SR0541 for gcc and SR650 for clang. Qt 5.12 is supported until
     December 2021.
   \endlist
 
@@ -210,12 +210,27 @@
   \endcode
   \endlist
 
-  Below is an example configuration for the BD-SL-i.MX6. For most VxWorks boards
-  the configure command will look very similar. By default, Qt 5 is configured to
-  use shared libraries. To build Qt 5 statically, add \c -static option for configure.
+  To build Qt 5 as shared libraries, add \c -shared option for configure.
+  To build Qt 5 statically, add \c -static option for configure.
+
+  Since support for llvm/clang toolchain in newer 5.12 has been added, there are two
+  types of default devices depending on the VxWorks 7 version used.
+
+  \list
+  \li \c vxworks-imx6-g++ for SR0541
+  \li \c vxworks-imx6-clang for SR0650
+  \endlist
+
+  Below is an example configuration for the BD-SL-i.MX6 when using VxWorks 7 SR0541.
+
+  \badcode
+    ./configure -commercial -shared -confirm-license -device vxworks-imx6-g++ -device-option CROSS_COMPILE=arm -prefix /sd1:1/qt5rtp -sysroot <path_to_vxworks_vsb_dir>/fsl_imx6_1_1_11_0_VSB -no-gcc-sysroot -extprefix <path_to_host_dir>/qt5rtp -hostprefix <path_to_host_dir>/qt5rtp -no-openssl -nomake tools -nomake examples
+  \endcode
+
+  Below is an example configuration for the BD-SL-i.MX6 when using VxWorks 7 SR0650.
 
   \badcode
-    ./configure -commercial -confirm-license -device vxworks-imx6 -device-option CROSS_COMPILE=arm -prefix /sd1:1/qt5rtp -sysroot <path_to_vxworks_vsb_dir>/fsl_imx6_1_1_11_0_VSB -no-gcc-sysroot -extprefix <path_to_host_dir>/qt5rtp -hostprefix <path_to_host_dir>/qt5rtp -no-openssl -nomake tools -nomake examples
+    ./configure -commercial -shared -confirm-license -device vxworks-imx6-clang -prefix /sd1:1/qt5rtp -sysroot <path_to_vxworks_vsb_dir>/fsl_imx6_1_1_11_0_VSB -extprefix <path_to_host_dir>/qt5rtp -hostprefix <path_to_host_dir>/qt5rtp -no-openssl -nomake tools -nomake examples
   \endcode
 
   The most important parameters are \c -device, \c -device-option CROSS_COMPILE=<arch>,
diff --git a/examples/demos/coffee/coffee.pro b/examples/demos/coffee/coffee.pro
index 369b8be4e..92c0dc70d 100644
--- a/examples/demos/coffee/coffee.pro
+++ b/examples/demos/coffee/coffee.pro
@@ -24,7 +24,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 qnx: target.path = /tmp/$${TARGET}/bin
-else: win32|if(unix:!android): target.path = $$[QT_INSTALL_EXAMPLES]/demos/$${TARGET}
+else: win32|unix: target.path = $$[QT_INSTALL_EXAMPLES]/demos/$${TARGET}
 !isEmpty(target.path): INSTALLS += target
 
 DISTFILES += \