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

* qtyocto/5.12:

  89ac66b Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
  f087aeb Revert "qtbase: Adjust target mkspec settings"
  8586caf qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
  7dc422d qtwayland: check also that the destination for private headers exists before installing them
  84d647a qtwayland: improve manual header installation
  3d60f9a qtwayland: workaround upstream bug: install missing headers manually
  eb5d6da qtwayland: disable gold for all archs like in qtbase
  e2707a0 qt5: upgrade to 5.12.3
  0778424 qtbase: disable gold for all archs not just x86
  4303873 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase
  8895ea3 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28
  95974f4 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks
  a4bf240 qtbase-native: add native libdir to search path
  adf7f60 qt5: patch build paths from installed files
  28d4bfd Upgrade to 5.12.2
  5a32838 layer.conf: Add warrior to compatible release series

Conflicts:
  recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
  recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
  recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
  recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch
  recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch
  recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch

Change-Id: Iec1b6e65f8dfbb73ab96d68a91ff6a5e7d93c7de

1 files changed, 2 insertions, 2 deletions

diff --git a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch
index 287983c6..e789ff58 100644
--- a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch
+++ b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch
@@ -1,4 +1,4 @@
-From e60c7bff6556d9c36952de525a85c479a30f0030 Mon Sep 17 00:00:00 2001
+From 9f06841c9ff8e50c604fbd0f100e2e3ea4242309 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 23 Aug 2018 02:58:14 +0000
 Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-index 96942c7..f828f04 100644
+index a4695a2..4b7a45b 100644
 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
 @@ -377,7 +377,11 @@