From 44f23572e7a53ba510dba5925cf32ec2061882cc Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 23 Mar 2021 15:12:30 +0100 Subject: 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 Reviewed-by: Qt CI Bot --- coin/module_config.yaml | 17 +++++++++++++++-- coin/product_dependencies.yaml | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'coin') 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 -- cgit v1.2.3