diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-22 22:38:07 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-23 19:40:35 +0000 |
| commit | 1b755b2e05a95a8c1d74f131d211b814109e3a32 (patch) | |
| tree | 1b63635fb6045f9c2ea3ff9ff9613f0ad3f3ef99 | |
| parent | 5443af98f1eb8a8726a0f833c578729e721ac80e (diff) | |
qttranslations, packagegroup-qt5-toolchain-target: drop qmlviewer
* it was removed from qttranslations in upstream commit:
commit c49e22e0b3a48b67f481f7362b74d90e6596b60f
Author: Kai Koehne <kai.koehne@qt.io>
Date: Mon Dec 3 14:44:42 2018 +0100
Drop qtquick1 module
qtquick1 has been removed from Qt in 5.6. The qtquick1 got removed
from the supermodule in qt 5.11.2 (see change
d60ef0b20247 in qt5.git). So it's high time to also remove the
qtquick1 and qmlviewer translation logic from qttranslations.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -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} += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \ qtdeclarative-tools \ qtdeclarative-staticdev \ - qttranslations-qmlviewer \ qttranslations-qtdeclarative \ qtenginio-dev \ 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" do_install_append() { # remove qtquick1 translations - qtquick1 is gone - for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -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 } @@ -19,7 +19,6 @@ PACKAGES =. " \ ${PN}-assistant \ ${PN}-designer \ ${PN}-linguist \ - ${PN}-qmlviewer \ ${PN}-qtconnectivity \ ${PN}-qtmultimedia \ ${PN}-qtlocation \ @@ -47,10 +46,6 @@ FILES_${PN}-linguist = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/linguist_*.qm \ " -FILES_${PN}-qmlviewer = " \ - ${OE_QMAKE_PATH_TRANSLATIONS}/qmlviewer_*.qm \ -" - FILES_${PN}-qtconnectivity = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtconnectivity_*.qm \ " |