diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2024-02-06 14:19:57 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-07 15:16:36 +0000 |
| commit | 329e7400f63579ffe232108aab197bc7c15e686f (patch) | |
| tree | 3cdca2cf6951d71766080c33a335e944497c1ded | |
| parent | cb8d1caef2d54c738e4880e0cfb5615013cea60a (diff) | |
Use demo launcher in the image conditionally
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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb | 4 |
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 0e6176bd..a2e27f21 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 \ |