diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-23 15:48:03 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-25 08:46:38 +0000 |
commit | 035e1b552606fbbb0efa3124bcb833622c1a4fd4 (patch) | |
tree | e5fd26c31e5261679667121563e23535e9e271a6 | |
parent | de715c72f99850dc959ecf9282fc356deebd67af (diff) | |
download | meta-boot2qt-035e1b552606fbbb0efa3124bcb833622c1a4fd4.tar.gz |
qt5: add qttranslation packages to image
Change-Id: Ie8b2859c11ecaa1461385d2a23b75ac15d958955
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
-rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | 12 | ||||
-rw-r--r-- | recipes-qt/qt5/qttranslations_git.bbappend | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index cc4784a..8909393 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | |||
@@ -46,8 +46,18 @@ RDEPENDS_${PN} += " \ | |||
46 | qtserialport \ | 46 | qtserialport \ |
47 | qtsvg \ | 47 | qtsvg \ |
48 | qttools \ | 48 | qttools \ |
49 | qttranslations-qt \ | ||
50 | qttranslations-qtbase \ | ||
51 | qttranslations-qtdeclarative \ | ||
52 | qttranslations-qtconnectivity \ | ||
53 | qttranslations-qtlocation \ | ||
54 | qttranslations-qtmultimedia \ | ||
55 | qttranslations-qtquickcontrols \ | ||
56 | qttranslations-qtserialport \ | ||
57 | qttranslations-qtwebsockets \ | ||
58 | qttranslations-qtxmlpatterns \ | ||
49 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ | 59 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ |
50 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ | 60 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine', '', d)} \ |
51 | qtwebsockets \ | 61 | qtwebsockets \ |
52 | qtwebchannel \ | 62 | qtwebchannel \ |
53 | qtxmlpatterns \ | 63 | qtxmlpatterns \ |
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index 8a5fa41..6c92e7c 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend | |||
@@ -21,3 +21,8 @@ | |||
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | SRCREV = "2d9a8c83893be4abde136ec87fc3db220ce8a0a5" | 23 | SRCREV = "2d9a8c83893be4abde136ec87fc3db220ce8a0a5" |
24 | |||
25 | PACKAGES += "${PN}-qtwebengine" | ||
26 | FILES_${PN}-qtwebengine = " \ | ||
27 | ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebengine_*.qm \ | ||
28 | " | ||