summaryrefslogtreecommitdiff
path: root/coin
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-19 09:46:39 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-04-09 11:05:16 +0200
commitdd9760379c83e0a2fe8b76f5a93c7e83aad55a06 (patch)
treedd9378e8aefe3cde41401d6bfb73022c94620580 /coin
parent6cf24f303c3d1146b428956db279925c3797e837 (diff)
downloadqttools-dd9760379c83e0a2fe8b76f5a93c7e83aad55a06.tar.gz
CMake: Enable iOS and Android configs in Coin
Change-Id: I5494fca8721de0d1f54670882010a5e22970b80e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/module_config.yaml17
1 files changed, 8 insertions, 9 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 9f29e1139..7f31a5544 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -1,13 +1,12 @@
-version: 1
+version: 2
accept_configuration:
condition: property
- property: host.os
- equals_property: target.os
+ property: features
+ not_contains_value: Disable
-build_instructions:
- - !include "{{qt/qtbase}}/prepare_building_env.yaml"
- - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml"
- - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
+instructions:
+ Build:
+ - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
-test_instructions:
- - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml"
+ Test:
+ - !include "{{qt/qtbase}}/coin_module_test_template_v2.yaml"