summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes-images/images/phytec-qt5demo-image.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-images/images/phytec-qt5demo-image.bb b/recipes-images/images/phytec-qt5demo-image.bb
index 2b7c5ac..d8f5a52 100644
--- a/recipes-images/images/phytec-qt5demo-image.bb
+++ b/recipes-images/images/phytec-qt5demo-image.bb
@@ -9,8 +9,6 @@ LICENSE = "MIT"
inherit distro_features_check populate_sdk_qt5
-CONFLICT_DISTRO_FEATURES = "x11"
-
IMAGE_INSTALL += "\
packagegroup-base \
\
@@ -18,6 +16,8 @@ IMAGE_INSTALL += "\
\
qt5-opengles2-test \
phytec-qtdemo \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland qtwayland-plugins weston weston-init', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland', '', d)} \
"
IMAGE_INSTALL_remove_mx6ul = "\