diff options
-rwxr-xr-x | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 1 | ||||
-rw-r--r-- | recipes-qt/qt5/qttranslations_git.bb | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 2f8d8a21..8067832c 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | |||
@@ -50,7 +50,6 @@ RDEPENDS_${PN} += " \ | |||
50 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \ | 50 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \ |
51 | qtdeclarative-tools \ | 51 | qtdeclarative-tools \ |
52 | qtdeclarative-staticdev \ | 52 | qtdeclarative-staticdev \ |
53 | qttranslations-qmlviewer \ | ||
54 | qttranslations-qtdeclarative \ | 53 | qttranslations-qtdeclarative \ |
55 | qtenginio-dev \ | 54 | qtenginio-dev \ |
56 | qtenginio-mkspecs \ | 55 | qtenginio-mkspecs \ |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 2fbf2344..bb6f2ff2 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 | ||
11 | do_install_append() { | 11 | do_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 -o -name qt_*.qm ! -name qt_help_*.qm`; do | 13 | for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do |
14 | rm $transfile | 14 | rm $transfile |
15 | done | 15 | done |
16 | } | 16 | } |
@@ -19,7 +19,6 @@ PACKAGES =. " \ | |||
19 | ${PN}-assistant \ | 19 | ${PN}-assistant \ |
20 | ${PN}-designer \ | 20 | ${PN}-designer \ |
21 | ${PN}-linguist \ | 21 | ${PN}-linguist \ |
22 | ${PN}-qmlviewer \ | ||
23 | ${PN}-qtconnectivity \ | 22 | ${PN}-qtconnectivity \ |
24 | ${PN}-qtmultimedia \ | 23 | ${PN}-qtmultimedia \ |
25 | ${PN}-qtlocation \ | 24 | ${PN}-qtlocation \ |
@@ -47,10 +46,6 @@ FILES_${PN}-linguist = " \ | |||
47 | ${OE_QMAKE_PATH_TRANSLATIONS}/linguist_*.qm \ | 46 | ${OE_QMAKE_PATH_TRANSLATIONS}/linguist_*.qm \ |
48 | " | 47 | " |
49 | 48 | ||
50 | FILES_${PN}-qmlviewer = " \ | ||
51 | ${OE_QMAKE_PATH_TRANSLATIONS}/qmlviewer_*.qm \ | ||
52 | " | ||
53 | |||
54 | FILES_${PN}-qtconnectivity = " \ | 49 | FILES_${PN}-qtconnectivity = " \ |
55 | ${OE_QMAKE_PATH_TRANSLATIONS}/qtconnectivity_*.qm \ | 50 | ${OE_QMAKE_PATH_TRANSLATIONS}/qtconnectivity_*.qm \ |
56 | " | 51 | " |