qt5: update submodules

Update to latest content in Qt 5.13 branch

Task-number: QTBUG-72311
Change-Id: If99527ca97867b99d5273e229d7e98a6cd149f5e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

2 files changed, 21 insertions, 38 deletions

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 b51c4c72..1aaf9498 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 a321d1b96ce0563a08d0bb44c39d24f86608f6ae Mon Sep 17 00:00:00 2001
+From 376b5b262f2ed936920a66167b76edab781ddcff 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
@@ -14,11 +14,12 @@ Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
 ---
  src/buildtools/configure_host.pro | 14 +++++++-------
+ src/buildtools/gn.pro             |  4 ++--
  src/core/config/linux.pri         |  2 +-
- 2 files changed, 8 insertions(+), 8 deletions(-)
+ 3 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index dd0d3e32..70161c82 100644
+index dd0d3e3..70161c8 100644
 --- a/src/buildtools/configure_host.pro
 +++ b/src/buildtools/configure_host.pro
 @@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -56,11 +57,26 @@ index dd0d3e32..70161c82 100644
  "  ar = \"$$which(ar)\" " \
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \
+diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
+index 7766af0..46defa6 100644
+--- a/src/buildtools/gn.pro
++++ b/src/buildtools/gn.pro
+@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
+             gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
+ 
+             gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \
+-                           --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
+-                           --ld \"$$which($$QMAKE_LINK)\" --ar \"$$which(ar)\"
++                           --cc \"$$which(gcc)\" --cxx \"$$which(g++)\" \
++                           --ld \"$$which(g++)\" --ar \"$$which(ar)\"
+             message($$gn_configure)
+             !system("$$pythonPathForSystem() $$gn_configure") {
+                 error("GN generation error!")
 diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index 85b948db..c529c641 100644
+index 04c9eca..c48fa06 100644
 --- a/src/core/config/linux.pri
 +++ b/src/core/config/linux.pri
-@@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") {
+@@ -115,7 +115,7 @@ contains(QT_ARCH, "mips") {
  
  host_build {
      gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
deleted file mode 100644
index d914a862..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f430c2c9b3d38f9150588da6dc154aa2285584e6 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] chromium: Force host toolchain configuration
-
-Force gcc/g++ to be used for parts using host toolchain, since
-the option(host_build) does not work in yocto builds.
-
-Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- gn/build/gen.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gn/build/gen.py b/gn/build/gen.py
-index 87db4c26bcf..34c853b7f4a 100755
---- a/gn/build/gen.py
-+++ b/gn/build/gen.py
-@@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-     ld = os.environ.get('LD', 'g++')
-     ar = os.environ.get('AR', 'ar -X64')
-   else:
--    cc = os.environ.get('CC', 'cc')
--    cxx = os.environ.get('CXX', 'c++')
-+    cc = os.environ.get('CC_host', 'gcc')
-+    cxx = os.environ.get('CXX_host', 'g++')
-     ld = cxx
--    ar = os.environ.get('AR', 'ar')
-+    ar = os.environ.get('AR_host', 'ar')
- 
-   # QTBUG-64759
-   # cflags = os.environ.get('CFLAGS', '').split()