Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12

* qtyocto/upstream/master:

  fb71293 qtwebengine: drop 0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
  38ec325 qwt-qt5: upgrade 6.1.3 -> 6.1.4
  e2d9845 qwt-qt5: Fix multilib install
  5be2654 qtwebengine: Fix build with clang/libc++ on aarch64/arm
  cb1b472 qtbase: Export host compiler and linker
  6d919b0 qt5-plugin-generic-vboxtouch: Fix build with clang/libc++
  6713882 maliit-framework,maliit-plugins: Fix build with libc++
  9a83f2d qtconnectivity: Fix build with clang/libc++
  080cc29 qtwayland: workaround upstream bug: install missing headers manually
  f6f61b0 gstreamer1.0-plugins-good: fix qt5 dependency
  d055d6a qtbase: Update the PACKAGECONFIG_KDE to enable more
  82abc2b qtbase: fix incomplete recipe changes from previous commit
  f4c8cef qtbase: Fix qtopcua issue on bigendian systems
  be8bc9f qtwebkit: Disable JIT for mips64

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtwayland_git.bb

Change-Id: I4ec16ed288fda7270c59abe70d337e7016f547c7

1 files changed, 3 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index d15a18c9..0c6be5a9 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -139,7 +139,6 @@ QT_MODULE_BRANCH_CHROMIUM = "69-based"
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-Force-host-toolchain-configuration.patch \
-    file://0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \
 "
 SRC_URI_append_libc-musl = "\
     file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
@@ -153,6 +152,9 @@ SRC_URI += " \
     file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
     file://chromium/0003-chromium-Fix-build-with-gcc8.patch;patchdir=src/3rdparty \
     file://chromium/0004-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
+    file://chromium/0019-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
+    file://chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch;patchdir=src/3rdparty \
+    file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
 "
 
 SRC_URI_append_libc-musl = "\