Merge remote-tracking branch 'qt/5.14' into 5.15

* qt/5.14:
  f6ebff39 Merge remote-tracking branch 'qt/upstream/master' into 5.14
  1b8e5570 qtbase: Use pcre packages by default
  fd7ac089 qt5: use PACKAGECONFIG to disable tests and examples
  1a7c8fa4 qtlocation: use geoclue 2
  ddbf8dd0 qtbase: use offscreen platform plugin for tools
  4f701ea1 qtbase: add openssl PACKAGECONFIG for native nativesdk
  56b2c13d qtbase-native: disable vulkan support
  6b34fd17 maliit-framework-qt5: fix test installations
  aa50163c qtenginio: remove obsolete module
  32edd746 ogl-runtime: update to v2.5.0 release
  f7dcc706 qtquick3d: add recipe
  b814111e qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
  1fde17e1 qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
  ca649e3f qt5: Update to Qt 5.14.0
  ede15adc qtbase: Fix patch fuzz detected with devtool
  e8221c2c qtbase: Backport the patch from upstream gerrit
  ca2f53f9 qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
  6e7cc682 qtwebengine: Move CharAllocator definition to header
  33a86256 qt5-creator: Add missing dep on libz.so
  3d47a569 qt5-creator: Make clang-format patch work with multiple clang versions
  d8f0db7f qtwebengine: Include cstddef for size_t definition
  b6bd407e qmllive: Fix build with multilib settings
  69e1fd33 quazip: Fix multilib builds
  a4db065b qtwebkit: Fix linking errors on clang/mips/ppc
  f756a065 ogl-runtime: Only compile for supported architectures
  710d995b qttools: Add option to disable qdoc
  a02e01ca qttools: Use CONFIG+=disable_external_rpath
  0d88f448 packagegroup-qt5-toolchain-target: Make machine specific
  2a2055fa recipes: Disable clang dependent recipes for riscv64/32

Conflicts:
  recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch

Change-Id: Ie1c25965f512eccade0a7518b3a2d23c6dc6b3c1

1 files changed, 22 insertions, 20 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 9ef729e2..77f8ffba 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -81,7 +81,7 @@ inherit qmake5
 inherit gettext
 inherit pythonnative
 inherit perlnative
-inherit distro_features_check
+inherit features_check
 
 # Static builds of QtWebEngine aren't supported.
 CONFLICT_DISTRO_FEATURES = "qt5-static"
@@ -137,8 +137,8 @@ RDEPENDS_${PN}-examples += " \
 
 QT_MODULE_BRANCH_CHROMIUM = "77-based"
 
-# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13
-# 5.13.meta-qt5.2
+# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.14
+# 5.14.meta-qt5.1
 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 \
@@ -146,11 +146,11 @@ SRC_URI += " \
 SRC_URI_append_libc-musl = "\
     file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
     file://0003-musl-link-against-libexecinfo.patch \
-    file://0004-musl-allow-build-without-glibc.patch \
+    file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \
 "
 
-# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/73-based
-# 73-based.meta-qt5.3
+# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/77-based
+# 77-based.meta-qt5.1
 SRC_URI += " \
     file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
     file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
@@ -159,23 +159,25 @@ SRC_URI += " \
     file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
     file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \
     file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \
-    file://chromium/0021-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \
+    file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \
+    file://chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \
+    file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \
 "
 
 SRC_URI_append_libc-musl = "\
-    file://chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
-    file://chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
-    file://chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
-    file://chromium/0011-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
-    file://chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
-    file://chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
-    file://chromium/0014-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
-    file://chromium/0015-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
-    file://chromium/0016-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
-    file://chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
-    file://chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
-    file://chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
-    file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
+    file://chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
+    file://chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
+    file://chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
+    file://chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
+    file://chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
+    file://chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
+    file://chromium/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
+    file://chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
+    file://chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
+    file://chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
+    file://chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
+    file://chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
+    file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
 "
 
 SRCREV_qtwebengine = "09ce1e76716ca660ef6a9b39e4bb0015d03a0793"