diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2024-02-27 10:02:41 +0000 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2024-02-27 12:34:18 +0000 |
| commit | d4fff3f4ec532d88a225db17097de07847c17299 (patch) | |
| tree | 7769f6e1591ea5b4ba015c45caa3f1706002bc1e /meta-boot2qt-distro | |
| parent | 081d0cbd26cf885ec6d068e110cf5ec386a7cd9d (diff) | |
squish: add SQUISH_PREFIX only if using squish
Don't add squish prefix environment variable unless
we have included squish.
Pick-to: nanbield mickledore kirkstone
Change-Id: I4a96a49b18a63869205d13bdcaf32de47784c2ab
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt-distro')
| -rw-r--r-- | meta-boot2qt-distro/conf/distro/b2qt.conf | 4 | ||||
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf index 0fdf3914..229cd67d 100644 --- a/meta-boot2qt-distro/conf/distro/b2qt.conf +++ b/meta-boot2qt-distro/conf/distro/b2qt.conf @@ -74,6 +74,10 @@ COPY_LIC_MANIFEST = "1" QT_EDITION = "commercial" +USE_SQUISH ?= "${@bb.utils.contains('QT_INTERNAL_BUILD', '1', \ + bb.utils.vercmp_string_op(d.getVar('QT_VERSION'), '6.6', '>') & \ + bb.utils.vercmp_string_op(d.getVar('QT_VERSION'), '6.8', '<'), False, d)}" + include conf/distro/include/b2qt.inc include conf/distro/include/machine-settings.inc include conf/distro/include/preferred-providers-${SDK_OS}.inc 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 c854a542..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 @@ -37,10 +37,6 @@ 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)}" -USE_SQUISH ?= "${@bb.utils.contains('QT_INTERNAL_BUILD', '1', \ - bb.utils.vercmp_string_op(d.getVar('QT_VERSION'), '6.6', '>') & \ - bb.utils.vercmp_string_op(d.getVar('QT_VERSION'), '6.8', '<'), False, d)}" - RDEPENDS:${PN} += " \ ${@'boot2qt-demolauncher' if bb.utils.to_boolean(d.getVar('USE_QT_DEMO_LAUNCHER')) else ''} \ boot2qt-appcontroller \ |