Merge remote-tracking branch 'qt/5.14' into 5.15

* qt/5.14: (22 commits)
  qtwebengine: add clang fix
  qt5: update submodules
  qt5: use PACKAGECONFIG to disable tests and examples
  qt5: update submodules
  qt5: update submodules
  qt5: update submodules
  qt5: update submodules
  ogl-runtime: update to v2.5.0 release
  qttools: don't install tst_qtattributionsscanner
  qt5: Upgrade to Qt 5.13.2
  python(3)-pyqt5: add qml support
  libqofono: bump SRCREV and add a fix for voicecall
  qt5: update submodules
  qt5: update submodules
  qtbase: add openssl PACKAGECONFIG for native nativesdk
  ogl-runtime: update to 2.5
  qtbase: Add PACKAGECONFIG for lttng
  layer: Mark zeus as compatible release
  ogl-runtime: Fix build on x86_64
  README.md: Document need for 32bit host compiler
  ...

Change-Id: I3892eef7a2ee02cde0f493df7aa1a27f683f1799

1 files changed, 4 insertions, 4 deletions

diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index c5473440..807be20c 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native"
 
-# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.11
-# 5.11.meta-qt5.2
+# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.13
+# 5.13.meta-qt5.1
 SRC_URI += "\
     file://0001-Do-not-skip-build-for-cross-compile.patch \
     file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \
-    file://0004-Fix-build-bug-for-armv32-BE.patch \
-    file://0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \
+    file://0003-Fix-build-bug-for-armv32-BE.patch \
+    file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \
 "
 
 inherit cmake_qt5 perlnative pythonnative