Merge remote-tracking branch 'qt/upstream/master' into 5.14

* qt/upstream/master: (28 commits)
  qtbase: Use pcre packages by default
  qt5: use PACKAGECONFIG to disable tests and examples
  qtlocation: use geoclue 2
  qtbase: use offscreen platform plugin for tools
  qtbase: add openssl PACKAGECONFIG for native nativesdk
  qtbase-native: disable vulkan support
  maliit-framework-qt5: fix test installations
  qtenginio: remove obsolete module
  ogl-runtime: update to v2.5.0 release
  qtquick3d: add recipe
  qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
  qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
  qt5: Update to Qt 5.14.0
  qtbase: Fix patch fuzz detected with devtool
  qtbase: Backport the patch from upstream gerrit
  qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
  qtwebengine: Move CharAllocator definition to header
  qt5-creator: Add missing dep on libz.so
  qt5-creator: Make clang-format patch work with multiple clang versions
  qtwebengine: Include cstddef for size_t definition
  ...

Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7

1 files changed, 1 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index f54f44e9..5b287dfa 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
 }