diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-03-23 15:12:30 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-05-22 14:11:25 +0200 |
| commit | 44f23572e7a53ba510dba5925cf32ec2061882cc (patch) | |
| tree | e64f86d6482258765f515c4a6c123f56b74a8ea5 /coin | |
| parent | 5f12127c9087a022d32ae91499f82157b0b49eff (diff) | |
Switch builds to cmake
* move the sync profile, so we can sync headers for the libs
project
* update dependencies
* add coin module config
* extend timeout for build
* bump version to 6.2
* disable qmake build by deleting the main pro file
* tweak product dependencies, cheat and point to even
not merged change
Task-number: QTBUG-91760
Change-Id: I02d6cda3a4ce09575ae993836b5089e1655401b9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/module_config.yaml | 17 | ||||
| -rw-r--r-- | coin/product_dependencies.yaml | 2 |
2 files changed, 16 insertions, 3 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index e8b9a7758..2ae2063c6 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -1,4 +1,17 @@ version: 2 +accept_configuration: + condition: property + property: features + not_contains_value: Disable + instructions: - Build: [] - Test: [] + Build: + - type: EnvironmentVariable + variableName: CMAKE_BUILD_TIMEOUT + variableValue: "36000" + - type: EnvironmentVariable + variableName: CMAKE_BUILD_OUTPUT_TIMEOUT + variableValue: "3600" + - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" + Test: + - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml" diff --git a/coin/product_dependencies.yaml b/coin/product_dependencies.yaml index c248d7b6b..101d8d04e 100644 --- a/coin/product_dependencies.yaml +++ b/coin/product_dependencies.yaml @@ -1,3 +1,3 @@ dependencies: ../qt5.git: - ref: "6.0" + ref: refs/changes/94/340894/11 |