diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2024-02-27 10:02:41 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-27 13:55:23 +0000 |
| commit | e4d1a22ba970c835303c62336bca7837be268b05 (patch) | |
| tree | c78e429d5e5cd288f033f876fa684d7f352888b2 | |
| parent | 71ef3de21918be4882833789ae970ab4b408b300 (diff) | |
squish: add SQUISH_PREFIX only if using squish
Don't add squish prefix environment variable unless
we have included squish.
Change-Id: I4a96a49b18a63869205d13bdcaf32de47784c2ab
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit d4fff3f4ec532d88a225db17097de07847c17299)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
4 files changed, 10 insertions, 5 deletions
diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf index 0c1988a9..c651aac6 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 \ diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb index f1164302..23fb4f3a 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb @@ -41,8 +41,14 @@ SRC_URI += "\ QT_QPA_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs', 'linuxfb', d)}" + +SQUISH_PREFIX ?= "${@'/opt/squish' if bb.utils.to_boolean(d.getVar('USE_SQUISH')) else ''}" + do_configure() { echo "QT_QPA_PLATFORM=${QT_QPA_PLATFORM}" >> ${WORKDIR}/defaults + if [ -n "${SQUISH_PREFIX}" ]; then + echo "SQUISH_PREFIX=${SQUISH_PREFIX}" >> ${WORKDIR}/defaults + fi } do_install:append() { diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults index e4c6b114..751210b0 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults @@ -3,4 +3,3 @@ QTWEBENGINE_DISABLE_SANDBOX=1 XDG_RUNTIME_DIR=/run/user/0 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/0/dbus_session_socket WAYLAND_DISPLAY=/run/wayland-0 -SQUISH_PREFIX=/opt/squish |