diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-10-15 16:24:08 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-10-19 10:32:37 +0000 |
| commit | 050481493d51d12e4a6035341f4a9610a0a56485 (patch) | |
| tree | 32953963778e250cb18837920aa9cce9bf654b9c | |
| parent | 037ebc1c5b808d6fe48143a39e1303210ad7f211 (diff) | |
| download | meta-boot2qt-050481493d51d12e4a6035341f4a9610a0a56485.tar.gz | |
qt5: sync installed qt modules in image and toolchain
Change-Id: I379426397749e1c39e7d0631b361b96699bce95d
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
| -rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 1 | ||||
| -rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 0fb16ef..a64f457 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | |||
| @@ -47,7 +47,6 @@ RDEPENDS_${PN} += " \ | |||
| 47 | qtsensors-dev \ | 47 | qtsensors-dev \ |
| 48 | qtserialport-dev \ | 48 | qtserialport-dev \ |
| 49 | qtsvg-dev \ | 49 | qtsvg-dev \ |
| 50 | qtsystems-dev \ | ||
| 51 | qttools-dev \ | 50 | qttools-dev \ |
| 52 | qttools-staticdev \ | 51 | qttools-staticdev \ |
| 53 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ | 52 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ |
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb index 93785a0..861f61a 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb | |||
| @@ -42,9 +42,11 @@ RDEPENDS_${PN} += " \ | |||
| 42 | qtsensors \ | 42 | qtsensors \ |
| 43 | qtserialport \ | 43 | qtserialport \ |
| 44 | qtsvg \ | 44 | qtsvg \ |
| 45 | qttools \ | ||
| 45 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ | 46 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ |
| 46 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ | 47 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ |
| 47 | qtwebsockets \ | 48 | qtwebsockets \ |
| 49 | qtwebchannel \ | ||
| 48 | qtxmlpatterns \ | 50 | qtxmlpatterns \ |
| 49 | qtquickcontrols \ | 51 | qtquickcontrols \ |
| 50 | " | 52 | " |