qt5: update submodulesv5.15.10-lts

Update to latest content in Qt 5.15.10 branch.

Task-number: QTBUG-102791
Change-Id: I17757aa9864b07aef02c2244951fe04ab8162709
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>

11 files changed, 19 insertions, 18 deletions

diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 6de9e1d1..7a391726 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -200,4 +200,4 @@ fakeroot do_generate_qt_environment_file() {
 do_generate_qt_environment_file[umask] = "022"
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "5bb784ebb05c06e00a3fefda2fcde5e2b6a7b064"
+SRCREV = "9c60c8b122e5eb74fe74e11b929c30aa19ec0dd3"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 8a8dd9dc..cb9c476e 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
 # Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.15"
+QT_MODULE_BRANCH ?= "5.15.10"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
 QT_MODULE_REPO ?= "${QT_MODULE}.git"
 
diff --git a/recipes-qt/qt5/qt5-lts.inc b/recipes-qt/qt5/qt5-lts.inc
index af611ce4..e561a4a0 100644
--- a/recipes-qt/qt5/qt5-lts.inc
+++ b/recipes-qt/qt5/qt5-lts.inc
@@ -4,6 +4,6 @@ QT_LTS_GIT ?= "git://codereview.qt-project.org/${QT_GIT_PROJECT}"
 QT_GIT = "${QT_LTS_GIT}"
 QT_LTS_GIT_PROTOCOL ?= "ssh"
 QT_GIT_PROTOCOL = "${QT_LTS_GIT_PROTOCOL}"
-QT_MODULE_BRANCH = "tqtc/lts-5.15"
+QT_MODULE_BRANCH = "tqtc/lts-5.15.10"
 QT_LTS_MODULE_REPO ?= "tqtc-${QT_MODULE}.git"
 QT_MODULE_REPO = "${QT_LTS_MODULE_REPO}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index f7be703b..9fd36407 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -143,4 +143,4 @@ do_install() {
     echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
 }
 
-SRCREV = "5bb784ebb05c06e00a3fefda2fcde5e2b6a7b064"
+SRCREV = "9c60c8b122e5eb74fe74e11b929c30aa19ec0dd3"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index f1a09889..844fa567 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -306,4 +306,4 @@ sed -i \
     $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
 }
 
-SRCREV = "5bb784ebb05c06e00a3fefda2fcde5e2b6a7b064"
+SRCREV = "9c60c8b122e5eb74fe74e11b929c30aa19ec0dd3"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index add32b18..c78acdc0 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -40,7 +40,7 @@ SRC_URI += "\
 # http://errors.yoctoproject.org/Errors/Build/44914/
 LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
-SRCREV = "fd8b8107e333330d03d7b354503203a6c3ffe722"
+SRCREV = "1296351d60ee6f64888bc2181b46d864f51d2201"
 
 # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
 do_install:append() {
diff --git a/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch
index 87d26ac0..f3e2d942 100644
--- a/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch
+++ b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch
@@ -1,4 +1,4 @@
-From 4d2f525ccf3255dd4a0e774d3db0533ae4aba98f Mon Sep 17 00:00:00 2001
+From 8a15c966acb8767137d181d3792b685b65522edb Mon Sep 17 00:00:00 2001
 From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com>
 Date: Tue, 8 Feb 2022 16:28:14 +0100
 Subject: [PATCH] gn.pro: do not try to statically link stdc++
@@ -8,7 +8,7 @@ Subject: [PATCH] gn.pro: do not try to statically link stdc++
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
-index a8ca6567..9632f0ef 100644
+index a8ca6567b..9632f0ef7 100644
 --- a/src/buildtools/gn.pro
 +++ b/src/buildtools/gn.pro
 @@ -20,7 +20,8 @@ build_pass|!debug_and_release {
diff --git a/recipes-qt/qt5/qtpdf_git.bb b/recipes-qt/qt5/qtpdf_git.bb
index c101f4b8..47da7d43 100644
--- a/recipes-qt/qt5/qtpdf_git.bb
+++ b/recipes-qt/qt5/qtpdf_git.bb
@@ -150,8 +150,8 @@ SRC_URI:append:libc-musl = "\
 
 SRC_URI:append:runtime-llvm = " file://native-clang.patch "
 
-SRCREV_qtwebengine = "56260bb605a74fabdfc74cef3bf890394af88b3d"
-SRCREV_chromium = "d13d0924c4e18ecc4b79adf0fec142ee9a9eaa14"
+SRCREV_qtwebengine = "c7e716ef1ffd63a8ab1f4dbf879230849eb3b505"
+SRCREV_chromium = "caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7"
 SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index bca23d9c..ec825991 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \
     ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
     ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \
 "
-SRCREV = "97a63ed277504bdac0c8085c788521bdce01f65a"
+SRCREV = "d35b8c5a9687ef4b5d76d96c29f14f2c24e5bf2b"
 
 BBCLASSEXTEND = "native nativesdk"
 
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 556148d9..60387212 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
-From 7a41b9ef89f18b26abf6355f5193d90a38147955 Mon Sep 17 00:00:00 2001
+From 3458287b7df203ff77df685edd3a498d70e09f59 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] Force host toolchain configuration
@@ -15,8 +15,8 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
 ---
  src/buildtools/config/linux.pri   |  2 +-
  src/buildtools/configure_host.pro | 14 +++++++-------
- src/buildtools/gn.pro             |  4 ++--
- 3 files changed, 10 insertions(+), 10 deletions(-)
+ src/buildtools/gn.pro             |  5 ++---
+ 3 files changed, 10 insertions(+), 11 deletions(-)
 
 diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
 index 7507d51ef..1e078cbfe 100644
@@ -71,15 +71,16 @@ index dd0d3e327..6312c8678 100644
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \
 diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
-index 033202e6e..a8ca6567b 100644
+index f94694da0..a8ca6567b 100644
 --- a/src/buildtools/gn.pro
 +++ b/src/buildtools/gn.pro
-@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
+@@ -19,9 +19,8 @@ build_pass|!debug_and_release {
              gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
  
              gn_gen_args = --no-last-commit-position --out-path $$out_path \
 -                          --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
 -                          --ld \"$$which($$QMAKE_LINK)\"
+-            !isEmpty(QMAKE_AR): gn_gen_args += --ar \"$$which($$first(QMAKE_AR))\"
 +                          --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \
 +                          --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\"
  
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 984bc1d8..b9f8f77e 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -197,8 +197,8 @@ SRC_URI:append:libc-musl = "\
     file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
 "
 
-SRCREV_qtwebengine = "a90f994c5d1e3edeafa8dc8048fe7c6a74aead1a"
-SRCREV_chromium = "0d984c7f044a08975088191f92ecc9bc62424b14"
+SRCREV_qtwebengine = "c7e716ef1ffd63a8ab1f4dbf879230849eb3b505"
+SRCREV_chromium = "caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7"
 SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine_chromium"