diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-05-13 16:26:33 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-05-20 11:27:36 +0300 |
commit | d5e0cf7f40587f68ef9d7f5af26b5557bb7b25e3 (patch) | |
tree | 637d7770a6c954533edd55ef521f14761cd7ce39 /recipes-qt/packagegroups | |
parent | cbf5a7653383beebf44c9634506661d1fa6dfcf3 (diff) | |
download | meta-boot2qt-d5e0cf7f40587f68ef9d7f5af26b5557bb7b25e3.tar.gz |
qt5: make qtwebengine a distro feature
Some devices won't have qtwebengine, so make it a DISTRO_FEATURE
that can be removed in device configs.
Change-Id: I751b1cdcc1eea48effec3980ed2da4799f88af9e
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'recipes-qt/packagegroups')
-rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 | ||||
-rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb | 3 |
2 files changed, 3 insertions, 2 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 d740991..bbc8e44 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | |||
@@ -51,5 +51,5 @@ RDEPENDS_${PN} += " \ | |||
51 | qtwebchannel-dev \ | 51 | qtwebchannel-dev \ |
52 | qtxmlpatterns-dev \ | 52 | qtxmlpatterns-dev \ |
53 | qtquickcontrols-dev \ | 53 | qtquickcontrols-dev \ |
54 | qtwebengine-dev \ | 54 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ |
55 | " | 55 | " |
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb index 970da82..c09d245 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb | |||
@@ -40,8 +40,9 @@ RDEPENDS_${PN} += " \ | |||
40 | qtsensors \ | 40 | qtsensors \ |
41 | qtserialport \ | 41 | qtserialport \ |
42 | qtsvg \ | 42 | qtsvg \ |
43 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ | ||
43 | qtwebsockets \ | 44 | qtwebsockets \ |
44 | qtxmlpatterns \ | 45 | qtxmlpatterns \ |
45 | qtquickcontrols \ | 46 | qtquickcontrols \ |
46 | qtwebengine \ | 47 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ |
47 | " | 48 | " |