lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prune Linux configurations in CI

Browse Source 
Remove the various FEATURE_xxx=off configurations, we don't support them
and if we break stuff, then those issues are easily fixed after the fact
and users relying on those combinations can provide patches. Most of them
are obsolete with Qt 6 anyway, as users can just not link against QtGui
or QtWidgets.

Also remove the -no-opengl configuration, with RHI it's mostly irrelevant
as there is very little Qt code outside of RHI that calls OpenGL APIs.

Combine the various other configurations into a single configuration
and remove subtle variations.

Pick-to: 6.3
Change-Id: Ia35713fc7373d54b82a11be14e2272ff011a51ab
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Volker Hilsheimer
2022-02-09 10:51:43 +01:00
parent fba918784f
commit 2e4d6af574
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
coin/platform_configs/cmake_platforms.yaml
View File

@@ -9,21 +9,6 @@ Include: [
macos.yaml
]
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache']
Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests']
Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=OFF'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests']
Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
@@ -34,7 +19,7 @@ Configurations:
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON'
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
-
Id: 'OpenSUSE-15.3-host'
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
@@ -43,11 +28,6 @@ Configurations:
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON'
Environment variables: [
'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc']
-
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
-
Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
Compiler: 'GCC'