diff --git a/recipes-qt/packagegroups/packagegroup-qt6-modules.bb b/recipes-qt/packagegroups/packagegroup-qt6-modules.bb index f18a2ad..71e5831 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-modules.bb @@ -8,18 +8,18 @@ inherit packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += " \ - qt3d \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \ qt5compat \ qtbase \ qtcoap \ qtconnectivity \ qtdeclarative \ - qtgraphicaleffects \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects', '', d)} \ qtimageformats \ qtmqtt \ qtnetworkauth \ qtopcua \ - qtquick3d \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick3d', '', d)} \ qtquickcontrols2 \ qtquicktimeline \ qtremoteobjects \ diff --git a/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb index f9a54c2..71a3710 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb @@ -9,7 +9,7 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += "\ - qt3d-dev \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \ qt5compat-dev \ qtbase-dev \ qtcoap-dev \ @@ -20,6 +20,7 @@ RDEPENDS_${PN} += "\ qtmqtt-dev \ qtnetworkauth-dev \ qtopcua-dev \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick3d-dev', '', d)} \ qtquick3d-dev \ qtquickcontrols2-dev \ qtquicktimeline-dev \ diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index 8500cf4..00ffa59 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = " \ " inherit qt6-cmake +inherit features_check + +REQUIRED_DISTRO_FEATURES = "opengl" include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index ca628b1..c97fd62 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -4,6 +4,9 @@ LIC_FILES_CHKSUM = " \ " inherit qt6-cmake +inherit features_check + +REQUIRED_DISTRO_FEATURES = "opengl" include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc