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

* qtyocto/5.12:

  baf9b8e Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
  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

Change-Id: I1e4d574975d80b0213d9f41cd1c060113429493b

1 files changed, 1 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
index c244a864..07092012 100644
--- a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
@@ -1,4 +1,4 @@
-From 9409b83e634b53eb59cc0935424ea6fca1f50491 Mon Sep 17 00:00:00 2001
+From b3125c1b3f32915aa80acf58a9d1eeab4e260b17 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Tue, 12 Dec 2017 16:06:14 +0200
 Subject: [PATCH] musl: don't use pvalloc as it's not available on musl