summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-19 09:46:21 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-03-19 15:17:38 +0100
commit5d2973afbd4fe3780b679e6ffa50a953aac252e4 (patch)
treef7f0e888c8a662e5bce1dd2986b30cd476581f88
parent210ba05aa833c81f64ab5aebf22c8f1d587ed118 (diff)
downloadqtgraphicaleffects-5d2973afbd4fe3780b679e6ffa50a953aac252e4.tar.gz
CMake: Enable iOS and Android configs in Coin
Change-Id: I0a4fc0e65c4e58d86be55ab6d8a48d1a956200c7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-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 9f29e11..7f31a55 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"