packagegroup-qt5-toolchain-target: always include qttools packages

PATCH Superseded Jonathan Liu 1 participant 1 message Oct 13, 2014

Share & tools

Jonathan Liu

author

2014-10-13 00:42 UTC #0 lore raw

PATCH 1/1 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.

---
 recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +5 -5

index 18ecb4d..25a5003 100644
@@ -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)} \

Signature · 1 line

2.1.2