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

The updated pyqt5 recipe removed from build as it had incorrect
checksum & SRC_URI seems to be inaccessible (it is a snapshot build
that seems to get overwritten by the next build, meaning the
package version defined in pyqt5 recipe title is accessible only a
short while).

Vulkan PACKAGECONFIG already included in our layer, removed the duplicate
entry.

* upstream/master:
  1650757f python3-pyqt5: Update to 5.15 version
  e8a44772 ogl-runtime: update to v2.7.0
  098b9aca qt5-creator_git: add x11 and opengl to REQUIRED_DISTRO_FEATURES
  fbbd24d9 qtwayland: conditional to support PACKAGECONFIG wayland-egl
  62bb2ca6 qtbase: Add vulkan to PACKAGECONFIGs
  b4340317 qt5: upgrade to 5.15.0

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qt3d_git.bb
  recipes-qt/qt5/qt5-git.inc
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
  recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtcharts_git.bb
  recipes-qt/qt5/qtcoap_git.bb
  recipes-qt/qt5/qtconnectivity_git.bb
  recipes-qt/qt5/qtdatavis3d_git.bb
  recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
  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/qtlottie_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/qtquick3d_git.bb
  recipes-qt/qt5/qtquickcontrols2_git.bb
  recipes-qt/qt5/qtquickcontrols_git.bb
  recipes-qt/qt5/qtquicktimeline_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/0004-mkspecs-Allow-builds-with-libc-glibc.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: I35e5db6b4f122290c2ff0c011d68636edde8e861

1 files changed, 2 insertions, 2 deletions

diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index a0fbe193..30a6c080 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -11,8 +11,8 @@ require qt5-git.inc
 
 DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
 
-# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.14
-# 5.14.meta-qt5.1
+# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.15
+# 5.15.meta-qt5.1
 SRC_URI += " \
     file://0001-Allow-a-tools-only-build.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \