Merge remote-tracking branch 'qtyocto/5.12' into 5.13

* qtyocto/5.12:
  ogl-runtime: Fix format-security issues
  ogl-runtime: fix build errors
  qtvirtualkeyboard: update supported layouts
  qt3d-runtime: update to ogl-runtime v2.4
  qtbase: update module
  qt5: update submodules
  qt5: update submodules
  qtbase: fix build with gcc-9
  qtlocation: add PACKAGECONFIGs for geoservices
  qmake5_base.bbclass: Don't expand find -name search patterns
  qt5: update submodules

Change-Id: Id6648d939ba54df0719660ace40d45fa3f1e1fbe

1 files changed, 4 insertions, 4 deletions

diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 739c12bf..9688c380 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared
-# 5.12.meta-qt5-shared.7
+# 5.12.meta-qt5-shared.8
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -45,10 +45,10 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native
-# 5.12.meta-qt5-native.7
+# 5.12.meta-qt5-native.8
 SRC_URI += " \
-    file://0017-Always-build-uic-and-qvkgen.patch \
-    file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \
+    file://0018-Always-build-uic-and-qvkgen.patch \
+    file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \
 "
 
 # CMake's toolchain configuration of nativesdk-qtbase