diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-06-22 15:07:14 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-24 10:37:22 +0000 |
| commit | a4163522572302f4192dad2be9bc61e072b96566 (patch) | |
| tree | 338506a9e7f889d46afe03e128b3972e845b6aeb | |
| parent | bc5c4f367f4945f19ab4703b2f265549c2f23b97 (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: Ie61e4f1022875b40d8cabd81ee1eb12eb7563795
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 3dd6d4e861755b863b9023691f79f8d1972ce9b8)
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 919d02e8..da86a04d 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -13,7 +13,12 @@ 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" |