From 725adf0c1e44ae1ad969e416dcac38b04b17a763 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 22 Jun 2022 15:05:13 +0200 Subject: coin: Prepare for using qt-configure-module in instructions When using qt-configure-module, we need to check if widgets feature is disabled with configure-style syntax as well. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I44147123a4c36ab6b8dfebb2affdc8c4bcde7149 Reviewed-by: Alexey Edelev (cherry picked from commit 23c87e42c80bb7c5dfb4530c2e6f746c7693c0d8) Reviewed-by: Qt Cherry-pick Bot --- coin/module_config.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 7004c27d..58c91b78 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -13,6 +13,11 @@ instructions: instructions: - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml" disable_if: - condition: property - property: configureArgs - contains_value: "-DFEATURE_widgets=OFF" + condition: or + conditions: + - condition: property + property: configureArgs + contains_value: "-DFEATURE_widgets=OFF" + - condition: property + property: configureArgs + contains_value: "-no-widgets" -- cgit v1.2.3