From 4e5a282793ca004ab99e9b860f3b3594cf643eb6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 9 Jun 2020 15:03:46 +0300 Subject: [PATCH] sdk: remove qtwayland Not compatible with current qtbase --- .../nativesdk-packagegroup-qt6-toolchain-host.bb | 4 +--- recipes-qt/packagegroups/packagegroup-qt6-modules.bb | 1 - recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb index db00c18..43486b8 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb @@ -9,13 +9,11 @@ RDEPENDS_${PN} += " \ nativesdk-make \ nativesdk-cmake \ nativesdk-ninja \ + nativesdk-perl-modules \ nativesdk-qtbase-dev \ nativesdk-qtbase-tools \ nativesdk-qtdeclarative-dev \ nativesdk-qtdeclarative-tools \ nativesdk-qttools-dev \ nativesdk-qttools-tools \ - nativesdk-qtwayland-dev \ - nativesdk-qtwayland-tools \ - nativesdk-perl-modules \ " diff --git a/recipes-qt/packagegroups/packagegroup-qt6-modules.bb b/recipes-qt/packagegroups/packagegroup-qt6-modules.bb index 5aa0625..3bef624 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-modules.bb @@ -24,7 +24,6 @@ RDEPENDS_${PN} += " \ qttools \ qttranslations \ qtvirtualkeyboard \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtwebchannel \ qtwebsockets \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'qtx11extras', '', d)} \ diff --git a/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb index 03f4402..33be31f 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb @@ -25,7 +25,6 @@ RDEPENDS_${PN} += "\ qttools-dev \ qttranslations-dev \ qtvirtualkeyboard-dev \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ qtwebchannel-dev \ qtwebsockets-dev \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'qtx11extras-dev', '', d)} \