From c4de929f3824375cc4cc5a6c9082f101ea22bc84 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Mon, 13 Oct 2014 12:35:02 +1100 Subject: packagegroup-qt5-toolchain-target: always include qttools packages The qttools packages were included only if the ruby layer was enabled as it required qtwebkit. However, qttools now has a PACKAGECONFIG option for qtwebkit and does not enable it by default so we can include the qttools packages even if the ruby layer is not enabled. Signed-off-by: Jonathan Liu Signed-off-by: Otavio Salvador --- recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 18ecb4da..25a50039 100644 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -13,11 +13,6 @@ USE_RUBY = " \ qtquick1-mkspecs \ qtquick1-plugins \ qtquick1-qmlplugins \ - qttools-dev \ - qttools-mkspecs \ - qttools-plugins \ - qttools-staticdev \ - qttools-tools \ qtwebkit-dev \ qtwebkit-mkspecs \ qtwebkit-qmlplugins \ @@ -84,6 +79,11 @@ RDEPENDS_${PN} += " \ qtsystems-dev \ qtsystems-mkspecs \ qtsystems-qmlplugins \ + qttools-dev \ + qttools-mkspecs \ + qttools-plugins \ + qttools-staticdev \ + qttools-tools \ ${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \ ${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \ -- cgit v1.2.3-54-g00ecf