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, 3 insertions, 3 deletions

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index fb5f9364..3f1bba23 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -242,17 +242,17 @@ qmake5_base_do_install() {
     qmake5_base_fix_install ${STAGING_DIR_NATIVE}
 
     # Replace host paths with qmake built-in properties
-    find ${D} \( -name *.pri -or -name *.prl \) -exec \
+    find ${D} \( -name "*.pri" -or -name "*.prl" \) -exec \
         sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \
             -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' {} \;
 
     # Replace host paths with pkg-config built-in variable
-    find ${D} -name *.pc -exec \
+    find ${D} -name "*.pc" -exec \
         sed -i -e 's|prefix=${STAGING_DIR_HOST}|prefix=|g' \
             -e 's|${STAGING_DIR_HOST}|${pc_sysrootdir}|g' {} \;
 
     # Replace resolved lib path with the lib name
-    find ${D} -name *.cmake -exec \
+    find ${D} -name "*.cmake" -exec \
         sed -i -e 's@/[^;]*/lib\([^;]*\)\.\(so\|a\)@\1@g' {} \;
 
 }