diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-06-22 15:05:13 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-24 10:27:42 +0000 |
| commit | 725adf0c1e44ae1ad969e416dcac38b04b17a763 (patch) | |
| tree | 04f0b3b4a9d334f7c11334527686613b660ecca1 | |
| parent | f52d0ab89d9c6e772eff15eb2d36342326d7b2f8 (diff) | |
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 <alexey.edelev@qt.io>
(cherry picked from commit 23c87e42c80bb7c5dfb4530c2e6f746c7693c0d8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/module_config.yaml | 11 |
1 files 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" |