From d5e0cf7f40587f68ef9d7f5af26b5557bb7b25e3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 13 May 2015 16:26:33 +0300 Subject: 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 --- .../packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 +- recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes-qt/packagegroups') 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} += " \ qtwebchannel-dev \ qtxmlpatterns-dev \ qtquickcontrols-dev \ - qtwebengine-dev \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ " 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} += " \ qtsensors \ qtserialport \ qtsvg \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtwebsockets \ qtxmlpatterns \ qtquickcontrols \ - qtwebengine \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ " -- cgit v1.2.3-54-g00ecf