Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12

* qtyocto/upstream/warrior:

  2a5f941 qtbase: fix build with gcc-9
  8bc72a7 qtlocation: add PACKAGECONFIGs for geoservices
  46c87e0 qmake5_base.bbclass: Don't expand find -name search patterns

Change-Id: I99658e8311a90d752f92ac486040b24bc98cefb2

1 files changed, 6 insertions, 5 deletions

diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 33b3e5f1..a412626f 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -18,7 +18,7 @@ require qt5-git.inc
 
 # 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 \
@@ -36,19 +36,20 @@ 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://0017-Fix-Wdeprecated-copy-warnings.patch \
 "
 
 # 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 \
 "
 
 # only for qtbase-native
 SRC_URI += " \
-    file://0019-Bootstrap-without-linkat-feature.patch \
+    file://0020-Bootstrap-without-linkat-feature.patch \
 "
 
 CLEANBROKEN = "1"