summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-06-29 13:29:25 +0300
committerOtavio Salvador <otavio@ossystems.com.br>2018-07-04 10:06:48 -0300
commit2b01a6d8b8e39030afe5e6a5876f873505bbc112 (patch)
tree474fc8befccd4503c77d177d925eec3f99d4413d /recipes-qt/qt5
parent0ea31eaf6a3b51c77c515589fb850a3570cba5be (diff)
downloadmeta-qt5-2b01a6d8b8e39030afe5e6a5876f873505bbc112.tar.gz
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>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb7
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"
10 10
11do_install_append() { 11do_install_append() {
12 # remove qtquick1 translations - qtquick1 is gone 12 # remove qtquick1 translations - qtquick1 is gone
13 for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qtquick1_*.qm`; do 13 for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do
14 rm $transfile 14 rm $transfile
15 done 15 done
16} 16}
@@ -33,7 +33,6 @@ PACKAGES =. " \
33 ${PN}-qtserialport \ 33 ${PN}-qtserialport \
34 ${PN}-qtbase \ 34 ${PN}-qtbase \
35 ${PN}-qthelp \ 35 ${PN}-qthelp \
36 ${PN}-qt \
37" 36"
38 37
39FILES_${PN}-assistant = " \ 38FILES_${PN}-assistant = " \
@@ -104,8 +103,4 @@ FILES_${PN}-qthelp = " \
104 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ 103 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
105" 104"
106 105
107FILES_${PN}-qt = " \
108 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
109"
110
111SRCREV = "3e0de1e1cd4fd194d1069b61f57a55b8d23ab60d" 106SRCREV = "3e0de1e1cd4fd194d1069b61f57a55b8d23ab60d"