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, 2 insertions, 2 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 c3597eaf..9b8ddef0 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 e4a6ca9bf08383ec3c271746edc9e970f4cd2412 Mon Sep 17 00:00:00 2001
+From 4575335a6a8b0727363afa03336c1762a340d7cf 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
@@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
  3 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
-index 2aa345c2..a55dc128 100644
+index c02af390..98af1d68 100644
 --- a/src/buildtools/config/linux.pri
 +++ b/src/buildtools/config/linux.pri
 @@ -122,7 +122,7 @@ contains(QT_ARCH, "mips") {