diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-06-29 13:29:25 +0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2018-07-04 10:06:48 -0300 |
| commit | 2b01a6d8b8e39030afe5e6a5876f873505bbc112 (patch) | |
| tree | 474fc8befccd4503c77d177d925eec3f99d4413d | |
| parent | 0ea31eaf6a3b51c77c515589fb850a3570cba5be (diff) | |
qttranslations: do not use qt meta catalog translation package
The qt_xx packages are meta catalogs that have dependencies to
qtquick1 which is not available anymore, which then breaks loading
of the translation file.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt5/qttranslations_git.bb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index d402bf1b..7b434e73 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 qtquick1_*.qm`; do + for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do rm $transfile done } @@ -33,7 +33,6 @@ PACKAGES =. " \ ${PN}-qtserialport \ ${PN}-qtbase \ ${PN}-qthelp \ - ${PN}-qt \ " FILES_${PN}-assistant = " \ @@ -104,8 +103,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -FILES_${PN}-qt = " \ - ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ -" - SRCREV = "3e0de1e1cd4fd194d1069b61f57a55b8d23ab60d" |