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/b2qt-addons | |
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/b2qt-addons')
-rw-r--r-- | recipes-qt/b2qt-addons/b2qt-demos.bb | 3 | ||||
-rw-r--r-- | recipes-qt/b2qt-addons/b2qt-launcher.bb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index d031b0a..42758fe 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb | |||
@@ -38,7 +38,8 @@ GITDIR_everywhere = "${DL_DIR}/qt5-everywhere-demo" | |||
38 | 38 | ||
39 | S = "${WORKDIR}/git/basicsuite" | 39 | S = "${WORKDIR}/git/basicsuite" |
40 | 40 | ||
41 | DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia qtwebengine" | 41 | DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia \ |
42 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" | ||
42 | 43 | ||
43 | do_install_append() { | 44 | do_install_append() { |
44 | # we only need plugins from the demos | 45 | # we only need plugins from the demos |
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 9e9c94b..b2de029 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb | |||
@@ -36,7 +36,8 @@ QT_BRANCH = "dev" | |||
36 | 36 | ||
37 | S = "${WORKDIR}/git" | 37 | S = "${WORKDIR}/git" |
38 | 38 | ||
39 | DEPENDS = "qtbase qtdeclarative qtwebengine" | 39 | DEPENDS = "qtbase qtdeclarative \ |
40 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" | ||
40 | 41 | ||
41 | do_install_append() { | 42 | do_install_append() { |
42 | install -m 0755 -d ${D}${sysconfdir}/init.d | 43 | install -m 0755 -d ${D}${sysconfdir}/init.d |