diff options
| author | Jonathan Liu <net147@gmail.com> | 2014-10-13 12:35:02 +1100 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2015-01-09 08:46:16 -0800 |
| commit | 95b5a3a1e890460cc934ea8c7d9a94f922c15a09 (patch) | |
| tree | 597323ce65307e46b088d016158a2d68f505713a /meta-qt5/recipes-qt | |
| parent | c7498b55730f48f766a7dfb95a7663700f710785 (diff) | |
| download | tizen-distro-95b5a3a1e890460cc934ea8c7d9a94f922c15a09.tar.gz tizen-distro-95b5a3a1e890460cc934ea8c7d9a94f922c15a09.tar.bz2 tizen-distro-95b5a3a1e890460cc934ea8c7d9a94f922c15a09.zip | |
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.
(From meta-qt5 rev: c4de929f3824375cc4cc5a6c9082f101ea22bc84)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Diffstat (limited to 'meta-qt5/recipes-qt')
| -rw-r--r-- | meta-qt5/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-qt5/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/meta-qt5/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 18ecb4da26..25a5003989 100644 --- a/meta-qt5/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/meta-qt5/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)} \ |