Merge remote-tracking branch 'qtyocto/5.12' into 5.13

* qtyocto/5.12:

  439f7be qt5: update submodules
  c8c8613 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
  6231201 qt5: update submodules
  4428b0c qttools/cmake: use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
  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
  356ff00 qt5: update submodules
  f6f61b0 gstreamer1.0-plugins-good: fix qt5 dependency
  d055d6a qtbase: Update the PACKAGECONFIG_KDE to enable more
  7935b6b qt5: update submodules
  b9131d6 qt5: update submodules
  0f27849 qt5: update submodules
  70e4a1c qt5: update submodules
  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/qt3d/0001-Allow-a-tools-only-build.patch
  recipes-qt/qt5/qt3d_git.bb
  recipes-qt/qt5/qt5-git.inc
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtcanvas3d_git.bb
  recipes-qt/qt5/qtcharts_git.bb
  recipes-qt/qt5/qtconnectivity_git.bb
  recipes-qt/qt5/qtdatavis3d_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtgamepad_git.bb
  recipes-qt/qt5/qtgraphicaleffects_git.bb
  recipes-qt/qt5/qtimageformats_git.bb
  recipes-qt/qt5/qtknx_git.bb
  recipes-qt/qt5/qtlocation_git.bb
  recipes-qt/qt5/qtmqtt_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtnetworkauth_git.bb
  recipes-qt/qt5/qtopcua_git.bb
  recipes-qt/qt5/qtpurchasing_git.bb
  recipes-qt/qt5/qtquickcontrols2_git.bb
  recipes-qt/qt5/qtquickcontrols_git.bb
  recipes-qt/qt5/qtremoteobjects_git.bb
  recipes-qt/qt5/qtscript_git.bb
  recipes-qt/qt5/qtscxml_git.bb
  recipes-qt/qt5/qtsensors_git.bb
  recipes-qt/qt5/qtserialbus_git.bb
  recipes-qt/qt5/qtserialport_git.bb
  recipes-qt/qt5/qtsvg_git.bb
  recipes-qt/qt5/qttools_git.bb
  recipes-qt/qt5/qttranslations_git.bb
  recipes-qt/qt5/qtvirtualkeyboard_git.bb
  recipes-qt/qt5/qtwayland_git.bb
  recipes-qt/qt5/qtwebchannel_git.bb
  recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebglplugin_git.bb
  recipes-qt/qt5/qtwebsockets_git.bb
  recipes-qt/qt5/qtwebview_git.bb
  recipes-qt/qt5/qtx11extras_git.bb
  recipes-qt/qt5/qtxmlpatterns_git.bb

Change-Id: If04e8cc63c0352c0811712bbd5d0c894a40628e4

1 files changed, 2 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 15d95ccb..cb75508e 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -139,7 +139,6 @@ QT_MODULE_BRANCH_CHROMIUM = "71-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 \
@@ -152,6 +151,8 @@ 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/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
 "
 
 SRC_URI_append_libc-musl = "\