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

* Diff in SRCREVs are due checkout from commit vs. checkout from
  corresponding tag in modules. The content is the same.
* metatypes inclusion was a bit different in upstream, synced with upstream
* update module_config.yaml

* upstream/master:
  02930760 qtmultimedia: create /usr/lib/plugins/videoeglvideonode referenced by Qt5MultimediaConfig.cmake
  b8bcf8cb qt5: upgrade to 5.15 beta3
  eac416fe qtdeclarative: bump SRCREV
  6558d2b5 nativesdk-qtbase: fix unpackaged files
  6b2323f3 qtwebengine: update patches for beta2
  20ae10f0 qt5: upgrade to 5.15 beta2
  a01de873 qtwebengine: fix QT_MODULE_BRANCH_CHROMIUM
  b88c292a qtquick3d: Fix branch for fetching assimp submodule
  df67d5a7 qt3d: update patch to apply
  a38953a6 qt5: upgrade to latest revisions in 5.15 branch
  9a645b02 qtwebengine: update patches for latest 5.15 revision
  6cce9817 qtwebengine: update patches for 5.15
  50e35581 qtbase: update patches for latest 5.15 revision
  9f024a55 qtdeclarative: add dependency on qtdeclarative-native
  76125ba8 qt5.inc: package metatypes files
  f3379951 qtbase: drop xkb, xcb-xinput PACKAGECONFIGs
  44405373 qt5: upgrade to latest revisions in 5.15 branch
  5e189731 layer: Mark dunfell as the only compatible release
  3e759d82 qtwebengine: Fix build with ninja >= 1.10.0
  f712bf9f python-pyqt5: remove PyQt_qreal_double from DISABLED_FEATURES
  79b0f3a6 python-pyqtchart: remove PyQt_qreal_double from DISABLED_FEATURES
  34ae49f8 qtmultimedia: Enable gstreamer support
  108b5664 gstreamer1.0-plugins-good: Turn on qt5 packageconfig
  4b6ce100 qt5-creator: Inherit mime-xdg
  89de99e7 python-{pyqt5,pyqtchart}: fold .inc file into .bb
  5d790449 python-pyqt5: drop python 2 recipe
  b2a958a4 python-pyqt5: disable whole PyQt_OpenGL and QtWidgets, QtQuickWidgets, QtQuick modules without opengl in DISTRO_FEATURES

Conflicts:
  conf/layer.conf
  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_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtlocation_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtquick3d_git.bb
  recipes-qt/qt5/qtremoteobjects_git.bb
  recipes-qt/qt5/qtserialport_git.bb
  recipes-qt/qt5/qttools_git.bb
  recipes-qt/qt5/qtvirtualkeyboard_git.bb
  recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
  recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch
  recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebview_git.bb

Change-Id: I61a651fd16d475ac0d8bbe119a3e3a8038692726

1 files changed, 4 insertions, 4 deletions

diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index cba86c63..67c1ef19 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = " \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
-# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared
-# 5.14.meta-qt5-shared.2
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared
+# 5.15.meta-qt5-shared.1
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -32,8 +32,8 @@ SRC_URI += "\
     file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
     file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
     file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
-    file://0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
+    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
+    file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
 "
 
 # for syncqt