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

* qtyocto/5.13: (46 commits)
  qtwayland: update module
  qt5: update submodules
  qt5: update submodules
  qt3d-runtime: update to v2.3
  qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
  qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
  qtbase: add libxext dependency for xcb PACKAGECONFIG
  python-pyqt5: Update to version 5.12.1.
  python-pyqt: Fix annoying problems.
  qtwebengine: arm: use OE specified -mcpu option
  Revert "qtbase: Adjust target mkspec settings"
  qtbase-tools: Fix error during pkg_postinst
  qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
  qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
  qtwayland: check also that the destination for private headers exists before installing them
  qtwayland: improve manual header installation
  qtwayland: workaround upstream bug: install missing headers manually
  qtwayland: disable gold for all archs like in qtbase
  qt5: upgrade to 5.12.3
  qtbase: disable gold for all archs not just x86
  ...

Change-Id: I43d594b17bfeadc102a8817285c5834062e9cd75

1 files changed, 5 insertions, 4 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 2277a6b7..b071113c 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -135,23 +135,24 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "73-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12
-# 5.12.meta-qt5.2
+# 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 \
 "
 SRC_URI_append_libc-musl = "\
-    file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
-    file://0004-musl-link-against-libexecinfo.patch \
+    file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
+    file://0003-musl-link-against-libexecinfo.patch \
 "
 
 # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/69-based
-# 69-based.meta-qt5.3
+# 69-based.meta-qt5.4
 SRC_URI += " \
     file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.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 \
+    file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
 "
 
 SRC_URI_append_libc-musl = "\