X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-qt%2Fqt%2Fqtbase_agldemo.inc;h=48d96b2dc103e48c2895c1e4b68a5d21af8ba787;hb=7baf8fb6dc8ed74332b7b587efae6097a4470237;hp=357e1e8bb86ca3a7babee44a29ff5e2a90437d83;hpb=41591d4f8c586aa801220fac0924556f406c58bd;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-qt/qt/qtbase_agldemo.inc b/recipes-qt/qt/qtbase_agldemo.inc
index 357e1e8bb..48d96b2dc 100644
--- a/recipes-qt/qt/qtbase_agldemo.inc
+++ b/recipes-qt/qt/qtbase_agldemo.inc
@@ -1,16 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
+# Enable EGL and KMS platform plugins to allow demos of Qt compositor
+# without Wayland
+PACKAGECONFIG_GL:append = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' eglfs kms gbm', '', d)}"
 
-PACKAGECONFIG_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
-
-PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
-# FIXME CLUSTER
-#PACKAGECONFIG_GL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' eglfs kms gbm', '', d)}"
-#
-PACKAGECONFIG_append = " ${PACKAGECONFIG_WAYLAND} icu accessibility"
-PACKAGECONFIG_append = " fontconfig"
-PACKAGECONFIG_append = " sql-sqlite"
-
-EXTRA_OECONF_append = ""
-
-# '-qpa wayland-egl' set wayland-egl as default of platform plagins
-PACKAGECONFIG[wayland]="-qpa wayland-egl -no-qpa-platform-guard"
+PACKAGECONFIG:append = " icu fontconfig sql-sqlite"