From b619ed1ba60e560d0ca7bea04d90a1ac27d69709 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 19 Aug 2020 18:17:46 +0200 Subject: CMake: Remove CI qmake configs for Qt 6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt 6.0 is now built with CMake successfully in the CI and we have most of the coverage we had with qmake CI configurations. Apart from platforms and modules we deemed not part of 6.0 release. We didn't have enough time to disable qmake configurations for 6.0.0, but we should be able do it now for 6.1. We can also consider removing qmake configurations for 6.0.x sometime later. Remove all CI configurations that use qmake to build Qt. Keep the default.yaml license check UseLegacyInstructions configuration, because license checking hasn't been ported to use new Coin instructions. One consequence of this is that developers that are working on platforms and modules not yet ported to CMake (like WebAssembly or qtwebengine), will no longer have coverage in CI until they are ported to CMake. If there are repo owners that wish to retain CI coverage for building their repo with qmake (until a CMake port is done), they can do so by creating a product_dependencies.yaml file in the root of their repo and specifying an older qt5.git sha1 (so before this change is merged) which still contains qmake CI configurations. Task-number: QTBUG-88741 Task-number: QTBUG-86053 Change-Id: I985cf0597d6d3e1717fdff8b654397a5f9236a6e Reviewed-by: Volker Hilsheimer Reviewed-by: Joerg Bornemann Reviewed-by: Simo Fält Reviewed-by: Lars Knoll --- coin/platform_configs/qtbase.yaml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'coin/platform_configs/qtbase.yaml') diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 0f20ad3f..4acb84b0 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -1,17 +1,6 @@ Version: 2 Include: [cmake_platforms.yaml] Configurations: -- - Template: 'qtci-linux-openSUSE-15.2-x86_64-50' - Target os: 'WebAssembly' - Compiler: 'GCC' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten' -- - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Features: ['UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' -- cgit v1.2.3