mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-06 14:14:36 +02:00
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>
This commit is contained in:
committed by
Otavio Salvador
parent
51a4cdf3fc
commit
c4de929f38
@@ -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)} \
|
||||
|
||||
Reference in New Issue
Block a user