Merge remote-tracking branch 'qt/upstream/master' into 5.15

- Several modules are actually newer than beta4 in upstream,
  hence the conflicts with SRCREVs.
- Replaced/removed local QPainterPath patches for qwt &
  creator with upstream ones.
- Updated the qtwebkit SRCREV to sync with upstream as it
  switched to same "5.212" branch as locally already, but
  kept the riscv patch

* upstream/master:
  d6b6838e qt5: upgrade to 5.15 beta4
  05b3e648 qtwebkit: Switch to 5.212 branch
  abed512f qt5-creator: Upgrade to 4.12 branch
  32c62abe qwt-qt5: fix build with Qt 5.15
  44fc90ee gstreamer1.0-plugins-good: Reemove inserting qt5 from packageconfig

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qt3d_git.bb
  recipes-qt/qt5/qt5-creator_git.bb
  recipes-qt/qt5/qt5-git.inc
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtquick3d_git.bb
  recipes-qt/qt5/qttranslations_git.bb
  recipes-qt/qt5/qtwayland_git.bb
  recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
  recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
  recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebkit_git.bb
  recipes-qt/qwt/qwt-qt5_6.1.4.bb

Change-Id: Icf6e747da78059c23568ea00ebbe50b28588aa3f

1 files changed, 3 insertions, 3 deletions

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
index 0e8e3bf4..4d95414e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
@@ -1,4 +1,4 @@
-From 097b6df14e56a9bd800a277d65e117fec96372a0 Mon Sep 17 00:00:00 2001
+From c820f61ac2e254758e863175423be6387907df81 Mon Sep 17 00:00:00 2001
 From: Johannes Pointner <johannes.pointner@br-automation.com>
 Date: Fri, 3 May 2019 09:12:38 +0200
 Subject: [PATCH] chromium: Do not try to set the guessed values for
@@ -17,10 +17,10 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
  1 file changed, 9 deletions(-)
 
 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
-index f5ac335af90..70b352f1ed1 100644
+index 13d71d04030..3ebcf1ddbc3 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -775,15 +775,6 @@ config("compiler_cpu_abi") {
+@@ -780,15 +780,6 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "arm") {
        if (is_clang && !is_android && !is_nacl) {
        }