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

* qtyocto/5.13:
  7d0ec75 Merge remote-tracking branch 'qtyocto/5.12' into 5.13
  c1deb9a ogl-runtime: Fix format-security issues
  1716c29 qt5: update to Qt 5.13.1
  e0cee22 ogl-runtime: fix build errors
  9978929 qtvirtualkeyboard: update supported layouts
  584d866 qtcoap: add optional dependency to qtdeclarative
  54a8456 qttranslations: qmlviewer and qtquick1 helps are removed
  e33d860 qt3d-runtime: update to ogl-runtime v2.4
  364eb06 Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
  0aff334 qtbase: update module
  be7aa4b qtbase: update module
  b4061d6 qtbase, qttools: update modules
  2d768e8 qt5: update submodules
  bf46332 qt5: update submodules
  bbe412d qt5: update submodules
  67a74e2 qtbase: fix typo in imageformats packageconfig
  a28765b Allow enabling gui for native and nativesdk
  e172b87 qt5: update submodules
  2a5f941 qtbase: fix build with gcc-9
  8bc72a7 qtlocation: add PACKAGECONFIGs for geoservices
  46c87e0 qmake5_base.bbclass: Don't expand find -name search patterns
  c96f9b3 qt5: update submodules

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_git.bb
  recipes-qt/qt5/qtcharts_git.bb
  recipes-qt/qt5/qtconnectivity_git.bb
  recipes-qt/qt5/qtdatavis3d_git.bb
  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/qtlocation_git.bb
  recipes-qt/qt5/qtlottie_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtnetworkauth_git.bb
  recipes-qt/qt5/qtpurchasing_git.bb
  recipes-qt/qt5/qtquickcontrols2_git.bb
  recipes-qt/qt5/qtquickcontrols_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_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: I85e1f23a2c1de6c0996ef166535b9c6a12766806

1 files changed, 1 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index de74f4fb..b9e9e4d0 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -10,7 +10,7 @@ DEPENDS += "qtbase qttools-native"
 
 do_install_append() {
     # remove qtquick1 translations - qtquick1 is gone
-    for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qmlviewer_*.qm -o -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do
+    for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do
         rm $transfile
     done
 }