summaryrefslogtreecommitdiff
path: root/coin
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-19 09:45:40 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-03-19 15:26:53 +0100
commit1b63da74d85a6927a44f2d4875e5790b3ca41f24 (patch)
treecde7917c136015697e2a0e57c9b51f854f0b3ad7 /coin
parent462727c0fabde9c9661cbef18a6a1cda0fc06c86 (diff)
downloadqtimageformats-1b63da74d85a6927a44f2d4875e5790b3ca41f24.tar.gz
CMake: Enable iOS and Android configs in Coin
Change-Id: I67e93f7b3fd1ee72724f8d2caae71a5f11d44047 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@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 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"