Merge integration refs/builds/qtci/dev/1617870959

This commit is contained in:
Qt CI Bot 2021-04-08 12:27:56 +00:00
commit f27b914e79

View File

@ -13,7 +13,7 @@ instructions:
equals_property: target.os
- condition: property
property: target.osVersion
not_equals_value: QEMU
not_in_values: [QEMU, WebAssembly]
- type: Group
instructions:
- !include "{{qt/qtbase}}/cmake_cross_compilation_qtbase_build_instructions.yaml"
@ -27,4 +27,4 @@ instructions:
enable_if:
condition: property
property: target.osVersion
in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710]
in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710, WebAssembly]