aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2024-02-06 14:19:57 +0000
committerMikko Gronoff <mikko.gronoff@qt.io>2024-03-14 14:43:55 +0200
commit21681054e87dcf623471b288e5ef598f1c6694f3 (patch)
treec08a8038599f06c77c865f03a104af8f234f3cc4
parent53a33a99be539b8adb0148bc47a9d1f14efbee48 (diff)
Use demo launcher in the image conditionallymickledore
Include the boot2qt demolauncher in the image only if wayland is supported and build is using at least Qt 6.7. USE_QT_DEMO_LAUNCHER variable can be used to disable the demo launcher on targets that don't want it. Change-Id: Iff48d0d5785dca03da4c944084f9a1a579ca074d Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io> (cherry picked from commit cca57a3f963d3aa136b70f2810dd45ad7f686af7) Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 35032407..6006afc1 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -34,7 +34,11 @@ inherit packagegroup
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+USE_QT_DEMO_LAUNCHER ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
+ bb.utils.vercmp_string_op(d.getVar('QT_VERSION'), '6.7', '>'), False, d)}"
+
RDEPENDS:${PN} += " \
+ ${@'boot2qt-demolauncher' if bb.utils.to_boolean(d.getVar('USE_QT_DEMO_LAUNCHER')) else ''} \
boot2qt-appcontroller \
boot2qt-startupscreen \
qdb \