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

* qtyocto/5.11:
  e863df2 nativesdk-qtbase: fix packaging QA issue
  a6d8420 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
  8e485a2 qtbase: default to internal harfbuzz-ng
  0c7eb25 layer.conf: Add thud to LAYERSERIES_COMPAT
  4e6c472 qt5-creator: Check before editing translation Makefile
  15a8c25 qt5-creator: Pick native tools from native sysroot e.g. lrelease etc.
  f11e942 qt5-creator: fix build with QMAKE_AR
  0cf5966 qt5-creator: upgrade to 4.7.1+
  4fb1e60 qt: package all files in ${PN}-examples
  2109ff6 qt: use single -dev and -staticdev package
  5c5b7e8 qt5-creator: refresh .patch files and push them to meta-qt5 fork
  333437c qt5-creator: Fix build due to missing lrelease
  3ad2acb qtchooser: Update to latest git
  1ed9bcb qtwebengine: Add patches to fix breakpad in new webengine release on musl
  24d6fc2 qtbase: Do not use cross_compile check
  d0cd7a7 qtbase: Fix errors due to -isystem
  8123922 qtbase: Fix build error for armv8BE multilib.
  f9e80ed qt5: update to latest revision in 5.11 branch
  3e7da25 qt5: update to Qt 5.11.2
  cd0da4e libqofono: include /qt5/mkspecs in ${PN}-dev
  db45ea6 qtwebkit-examples: Fix build with QT 5.11
  d498eb6 qtwebkit: Use relative paths for pri files when cross compile
  b716195 qmake5_paths: change the default QT_DIR_NAME to be empty
  3224b02 nativesdk-qtbase: use default PACKAGES
  66c49f8 qt5-creator: strip few more useless rpaths
  03b4c7b qt: remove unnecessary FILES.*-dbg variables for packaging .debug files
  5164f84 qt3d-runtime: Fix compile errors as seen with mips/musl
  08aaba0 qt3d-runtime: upgrade to latest revision in 2.0 branch
  a8832a7 qtwebkit: Make qtwebkit support arm32 BE.
  215e81d qtscript: add patches to meta-qt5 fork
  66a9704 qtscript: Fix build on musl
  edf1e43 qtwebkit: add patches to meta-qt5 fork
  a307eb0 qtwebkit: Fix conflicts with -I and -isystem
  3e4141c qtwebkit: Fix build with musl
  c977d68 qt5-creator: Strip out redundant RPATH
  189dd8a qt5-creator: Fix building botan for all non-x86 arches
  85e665b qtwebengine: use nasm-native instead of yasm-native
  75bc440 qtbase: fix install locations used in static builds
  823fa38 qtwebengine: enable debug info for webengine

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qt3d-runtime_git.bb
  recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
  recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
  recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
  recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch

Change-Id: Id38a2f68bd27b1fe8ffc7bbf2c74bad1fb2b92d0

1 files changed, 4 insertions, 2 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 98aa0ce0..d01cbfac 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
     nss-native \
     nspr-native \
     ninja-native \
-    yasm-native \
+    nasm-native \
     bison-native \
     qtwebchannel \
     qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \
@@ -136,7 +136,7 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "69-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11
-# 5.11.meta-qt5.6
+# 5.11.meta-qt5.7
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
@@ -170,6 +170,8 @@ SRC_URI_append_libc-musl = "\
     file://chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
     file://chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \
     file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
+    file://chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch;patchdir=src/3rdparty \
+    file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch;patchdir=src/3rdparty \
 "
 
 SRCREV_qtwebengine = "75f6f4d3178d9356aff9a5a14f8601ebc8b70c95"