1 files changed, 6 insertions, 10 deletions
diff --git a/external/meta-qt5/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/external/meta-qt5/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index d206a100..8c8bed30 100755
--- a/external/meta-qt5/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/external/meta-qt5/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -3,15 +3,11 @@
 DESCRIPTION = "Target packages for Qt5 SDK"
 LICENSE = "MIT"
 
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
 inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-# Requires Ruby to work
-USE_RUBY = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-dev', '', d)} \
-"
-
 # Requires Wayland to work
 USE_WAYLAND = " \
     qtwayland-dev \
@@ -51,11 +47,7 @@ RDEPENDS_${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \
     qtdeclarative-tools \
     qtdeclarative-staticdev \
-    qttranslations-qmlviewer \
     qttranslations-qtdeclarative \
-    qtenginio-dev \
-    qtenginio-mkspecs \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtenginio-qmlplugins', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects-qmlplugins', '', d)} \
     qtimageformats-dev \
     qtimageformats-plugins \
@@ -93,7 +85,6 @@ RDEPENDS_${PN} += " \
     qttools-staticdev \
     qttools-tools \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \
-    ${USE_RUBY} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
     qtwebsockets-dev \
     qtwebsockets-mkspecs \
@@ -109,8 +100,13 @@ RDEPENDS_${PN} += " \
     qtquickcontrols2-dev \
     qtquickcontrols2-mkspecs \
 "
+RDEPENDS_${PN}_remove_toolchain-clang_riscv32 = "qttools-dev qttools-mkspecs qttools-staticdev qttools-tools"
+RDEPENDS_${PN}_remove_toolchain-clang_riscv64 = "qttools-dev qttools-mkspecs qttools-staticdev qttools-tools"
 
 RRECOMMENDS_${PN} += " \
     qtquickcontrols-qmlplugins \
     qttools-plugins \
 "
+
+RRECOMMENDS_${PN}_remove_toolchain-clang_riscv32 = "qttools-plugins"
+RRECOMMENDS_${PN}_remove_toolchain-clang_riscv64 = "qttools-plugins"