Merge remote-tracking branch 'qt/upstream/master' into 5.15

* upstream/master:
  cfcd40e3 qtbase: Restrict 'tests' build to distros with 'ptest' support
  0d4af49f qt5-ptest: give rwx permission to user for all the test files
  d2ff90b2 qtquicktimeline: upgrade to 5.15 rc1
  790bc195 qtquicktimeline: add recipe
  07a54bf2 qt5: upgrade to 5.15 rc1
  288cdf60 qtwebengine: Fix build with musl
  ac9951b2 qtquick3d: Add module prefix for enabling assimp

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  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/qtcharts_git.bb
  recipes-qt/qt5/qtcoap_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/qtquick3d_git.bb
  recipes-qt/qt5/qtquickcontrols2_git.bb
  recipes-qt/qt5/qtquickcontrols_git.bb
  recipes-qt/qt5/qtquicktimeline_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/qtvirtualkeyboard_git.bb
  recipes-qt/qt5/qtwayland_git.bb
  recipes-qt/qt5/qtwebchannel_git.bb
  recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
  recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.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: I9ba9efdb2b62ecf23b919499d58d51b8a8c7c4a3

1 files changed, 3 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index bb4c5e9f..bced1e4e 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -145,7 +145,7 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "80-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
-# 5.15.meta-qt5.5
+# 5.15.meta-qt5.6
 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 \
@@ -169,6 +169,7 @@ SRC_URI += " \
     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 \
+    file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \
     file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \
 "
 
@@ -186,6 +187,7 @@ SRC_URI_append_libc-musl = "\
     file://chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
     file://chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
     file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
+    file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
 "
 
 SRCREV_qtwebengine = "387fb9377d61683bcd0f59a637afffdd9a16912c"