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

In addition to commits below, fixed PV value to "5.12.1" in qt5-git.inc

* upstream/master:

  51e0780 qtbase: replace the fix for gcc-4.8 with the one from upstream
  c67abd6 qtbase: Fix build with gcc 4.8
  f69fc40 qtwebengine: Fix build with musl/gcc9
  7cc177d qtwebkit-examples: drop recipe
  1b755b2 qttranslations, packagegroup-qt5-toolchain-target: drop qmlviewer
  5443af9 qtwayland: revert one patch from 5.12 branch to make it compatible with 5.12.0 qtbase
  bd9d830 qt3d-runtime: drop patch resolved upstream
  44f4fc3 qt5everywheredemo: add dependency on qtxmlpatterns
  77edae5 qtconnectivity: drop patch resolved upstream
  d45b966 qtwebengine: update chromium musl patchset
  8c7797b qtbase: add env variable for host bin suffix
  f1a5e8a qtwebengine: include sources in the debug package, add x11 PACKAGECONFIG
  2be2731 libqofono: add dependency on qtxmlpatterns
  725fc1f qtxmlpatterns: add qtdeclarative PACKAGECONFIG
  b7b0a78 qtdeclarative: remove qtxmlpatterns PACKAGECONFIG
  57aab31 qtwayland: update PACKAGECONFIG options
  299a326 qtbase: update xinput PACKAGECONFIG
  6531fa7 qtbase: use v5.12.0 as base
  c8d5ef5 qt5: upgrade to latest revision in 5.12
  c6be23d qt5: upgrade to latest revision in 5.12
  201fcf2 qt5-plugin-generic-vboxtouch: fix segfault
  5b35f89 qtwebengine: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
  808d65c qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
  a55a993 libconnman-qt5: Don't harcode libdir to fix multilib build
  c483f15 qtbase: Fix build with gcc9
  b725e6d qtbase: Consider clang when computing QMAKE_CXX.COMPILER_MACROS
  7016481 qt5-creator: Enable clang plugin support when clang is used as toolchain
  ba03a76 qtwebkit: Fix build with clang
  7223816 maliit: Disable tests
  4c3d66f qtbase: Drop QMAKE_WAYLAND_SCANNER from clang mkspecs file
  f2d7b94 qtconnectivity: Ignore -Waddress-of-temporary when using clang
  b8fade9 qtbase: Fix build with clang/musl
  0cdf727 qt5: upgrade to 5.11.3
  9fc65c0 qtwebengine: Configure Ninja to honor PARALLEL_MAKE
  010a29e qmllive: add new recipe
  f227502 python-pyqt5: MAKEFLAGS pass -j 1 via MAKEFLAGS during do_install
  fe453ec packagegroup-qt5-toolchain-target: Skip qtwebkit if opengl not found
  18f82a8 python-pyqt5: Disable parallel install

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
  recipes-qt/qt5/qt3d_git.bb
  recipes-qt/qt5/qt5-git.inc
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
  recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
  recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtcanvas3d_git.bb
  recipes-qt/qt5/qtcharts_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/qtquickcontrols2_git.bb
  recipes-qt/qt5/qtquickcontrols_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/qttranslations_git.bb
  recipes-qt/qt5/qtvirtualkeyboard_git.bb
  recipes-qt/qt5/qtwayland_git.bb
  recipes-qt/qt5/qtwebchannel_git.bb
  recipes-qt/qt5/qtwebengine/0002-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
  recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
  recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
  recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch
  recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
  recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch
  recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
  recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
  recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
  recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch
  recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
  recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
  recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
  recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.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: Ic896ea4ae0f64daaedc43a6736fc0243599f05f6

1 files changed, 2 insertions, 2 deletions

diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 2abb1bd0..163e144f 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -12,8 +12,8 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
 
 SRCREV = "2dfb1d046d4a1dcb046bfb287d240a8869c78baa"
 
-# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11
-# 5.11.meta-qt5.5
+# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12
+# 5.12.meta-qt5.1
 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
 
 do_install_append_class-nativesdk() {