aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPasi Petäjäjärvi <pasi.petajajarvi@qt.io>2022-06-02 11:19:53 +0300
committerPasi Petäjäjärvi <pasi.petajajarvi@qt.io>2022-06-02 11:28:17 +0300
commit9382a8d4d92ff8785a42958a28783d9d408ad944 (patch)
treecf474f99ab3640de1eb725ca33e8b32908bb0055
parent95947b8c8f4e4dd53b0e310d54725c3e4c7124c9 (diff)
Fix checking when qmlcompilerplus is enabled
As 7b0817669a356a268d0b87d2ade4de5f817c7f01 introduced new variable to control commercial modules inclusion, here it was forgotten. Change-Id: Iabf7393cab435667ab3e5f284479b9d149a97c7c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb
index f7d8ba8b..b494913c 100644
--- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb
@@ -40,7 +40,7 @@ TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-toolchain-host"
TOOLCHAIN_TARGET_TASK += "packagegroup-qt6-modules ${MACHINE_EXTRA_INSTALL_SDK}"
PACKAGE_EXCLUDE_COMPLEMENTARY += "\
- ${@bb.utils.contains('ENABLE_QMLCOMPILER', '1', 'qmlcompilerplus-dev', '', d)} \
+ ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'qmlcompilerplus-dev', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \
qt5compat-dev \
qtapplicationmanager-dev \