Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12

* qtocto/upstream/warrior:
  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

Conflicts:
  recipes-qt/qt5/qtbase_git.bb

Change-Id: I853b6669bd4e42224b278587c412032903ba5555

1 files changed, 8 insertions, 8 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 7136b475..8de23c76 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
-From bf92c8a03189d7a559aff7d62c2d9fc6047d2659 Mon Sep 17 00:00:00 2001
+From eb0b90b8809a8d8bd76999056d74d433a6c23184 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] Force host toolchain configuration
@@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
  2 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index dd0d3e32..70161c82 100644
+index dd0d3e32..6312c867 100644
 --- a/src/buildtools/configure_host.pro
 +++ b/src/buildtools/configure_host.pro
 @@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -37,9 +37,9 @@ index dd0d3e32..70161c82 100644
 -"  cc = \"$$which($$QMAKE_CC)\" " \
 -"  cxx = \"$$which($$QMAKE_CXX)\" " \
 -"  ld = \"$$which($$QMAKE_LINK)\" " \
-+"  cc = \"$$which(gcc)\" " \
-+"  cxx = \"$$which(g++)\" " \
-+"  ld = \"$$which(g++)\" " \
++"  cc = \"$$which($$CC_host)\" " \
++"  cxx = \"$$which($$CXX_host)\" " \
++"  ld = \"$$which($$CXX_host)\" " \
  "  ar = \"$$which(ar)\" " \
  "  nm = \"$$which(nm)\" " \
  "  extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \
@@ -50,9 +50,9 @@ index dd0d3e32..70161c82 100644
 -"  cc = \"$$which($$QMAKE_CC)\" " \
 -"  cxx = \"$$which($$QMAKE_CXX)\" " \
 -"  ld = \"$$which($$QMAKE_LINK)\" " \
-+"  cc = \"$$which(gcc)\" " \
-+"  cxx = \"$$which(g++)\" " \
-+"  ld = \"$$which(g++)\" " \
++"  cc = \"$$which($$CC_host)\" " \
++"  cxx = \"$$which($$CXX_host)\" " \
++"  ld = \"$$which($$CXX_host)\" " \
  "  ar = \"$$which(ar)\" " \
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \