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

* qtocto/upstream/warrior:
  60e61ea qt3d-runtime: update to v2.3
  cad5f8c qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
  44aab3a qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
  000e298 qtbase: add libxext dependency for xcb PACKAGECONFIG
  ba08444 python-pyqt5: Update to version 5.12.1.
  6a1a387 python-pyqt: Fix annoying problems.
  c7e0ba5 qtwebengine: arm: use OE specified -mcpu option
  9c62c01 qtbase-tools: Fix error during pkg_postinst
  f4531ec qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm

Conflicts:
  recipes-qt/qt5/qtbase_git.bb

Change-Id: I853b6669bd4e42224b278587c412032903ba5555

1 files changed, 2 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index d612552a..c4780d8b 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -135,7 +135,7 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "69-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12
-# 5.12.meta-qt5.3
+# 5.12.meta-qt5.4
 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 \
@@ -155,6 +155,7 @@ SRC_URI += " \
     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 \
+    file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
 "
 
 SRC_URI_append_libc-musl = "\