diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-01-23 07:56:09 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-07 10:05:59 +0000 |
| commit | cf932594dcc9fa3e701e6cd8f564aa9fc3277563 (patch) | |
| tree | dcdf98113c4ae8bd9dfa6579b8de87d899495901 | |
| parent | 7f695b0a198937f26adb354f36f6796734af618a (diff) | |
| download | qtsvg-cf932594dcc9fa3e701e6cd8f564aa9fc3277563.tar.gz | |
cmake: add Android build
Task-number: QTBUG-78945
Change-Id: I5a5f24f3c073f39f06f0ac1242c8a61a9fe64204
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 17 |
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" |