diff options
| author | Simo Fält <simo.falt@qt.io> | 2021-07-14 16:06:41 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@qt.io> | 2021-08-23 12:06:13 +0000 |
| commit | fcff513db5457529f4a9c847aec9b3566636b519 (patch) | |
| tree | 9754198285d422a62fdf60a9570ded592995a3f3 /coin | |
| parent | 8890ca3d97216b4b877940c24ed9049a080aeb6c (diff) | |
Make Integrity to use cross compile instructions
Change-Id: I22617a5f7b8971eae679058feaf41ba811e0a3dd
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit aa1433fd94b130d22b177438e83b18aa30d17b02)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/coin_module_build_template_v2.yaml | 4 | ||||
| -rw-r--r-- | coin/instructions/coin_qtbase_build_template_v2.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml index 9240842bb0..2dc5fb5c9e 100644 --- a/coin/instructions/coin_module_build_template_v2.yaml +++ b/coin/instructions/coin_module_build_template_v2.yaml @@ -20,7 +20,7 @@ instructions: equals_property: target.os - condition: property property: target.osVersion - not_in_values: [QEMU, WebAssembly] + not_in_values: [QEMU, WebAssembly, INTEGRITY] - condition: property property: features not_contains_value: "TargetBuildOnly" @@ -40,7 +40,7 @@ instructions: conditions: - condition: property property: target.osVersion - in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710, WebAssembly] + in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710, WebAssembly, INTEGRITY] - condition: and conditions: - condition: property diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml index 1df85b6874..503916b417 100644 --- a/coin/instructions/coin_qtbase_build_template_v2.yaml +++ b/coin/instructions/coin_qtbase_build_template_v2.yaml @@ -13,7 +13,7 @@ instructions: equals_property: target.os - condition: property property: target.osVersion - not_in_values: [QEMU, WebAssembly] + not_in_values: [QEMU, WebAssembly, INTEGRITY] - condition: property property: features not_contains_value: "TargetBuildOnly" @@ -32,7 +32,7 @@ instructions: conditions: - condition: property property: target.osVersion - in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710, WebAssembly] + in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710, WebAssembly, INTEGRITY] - condition: and conditions: - condition: property |