summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2014-10-13 12:35:02 +1100
committerOtavio Salvador <otavio@ossystems.com.br>2014-10-21 09:37:45 -0200
commitc4de929f3824375cc4cc5a6c9082f101ea22bc84 (patch)
treecccd3200340c1b8e9ce6f0134126a808c514c177
parent51a4cdf3fcdc132cc7b5af0e240c5d1007e43590 (diff)
downloadmeta-qt5-c4de929f3824375cc4cc5a6c9082f101ea22bc84.tar.gz
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 <net147@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb10
1 files 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 = " \
13 qtquick1-mkspecs \ 13 qtquick1-mkspecs \
14 qtquick1-plugins \ 14 qtquick1-plugins \
15 qtquick1-qmlplugins \ 15 qtquick1-qmlplugins \
16 qttools-dev \
17 qttools-mkspecs \
18 qttools-plugins \
19 qttools-staticdev \
20 qttools-tools \
21 qtwebkit-dev \ 16 qtwebkit-dev \
22 qtwebkit-mkspecs \ 17 qtwebkit-mkspecs \
23 qtwebkit-qmlplugins \ 18 qtwebkit-qmlplugins \
@@ -84,6 +79,11 @@ RDEPENDS_${PN} += " \
84 qtsystems-dev \ 79 qtsystems-dev \
85 qtsystems-mkspecs \ 80 qtsystems-mkspecs \
86 qtsystems-qmlplugins \ 81 qtsystems-qmlplugins \
82 qttools-dev \
83 qttools-mkspecs \
84 qttools-plugins \
85 qttools-staticdev \
86 qttools-tools \
87 ${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \ 87 ${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \
88 ${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '', d)} \ 88 ${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '', d)} \
89 ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \ 89 ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \