aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-12-13 16:00:55 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-12-26 09:48:10 +0000
commitfd7880c4f40a07608432403ca5ee4aed45ed2e97 (patch)
tree73dc171f8374c02d621dbd037a67e13bccc8417f
parent85dbd4d1416d5456f6df1d7c338248a9e4210800 (diff)
Remove duplicate MinGW environment variables
Change-Id: I2018b0c46b9708f699e5da6155e95151a49394fb Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 5ce8c724d2c51d896271a3a562f10de1fe151d87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml2
1 files changed, 0 insertions, 2 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index fee292dd..9f0549c6 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -228,7 +228,6 @@ Configurations:
-
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'Mingw'
- Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Features: ['Sccache']
Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
@@ -236,7 +235,6 @@ Configurations:
-
Template: 'qtci-windows-11_21H2-x86_64-51'
Compiler: 'Mingw'
- Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Features: ['Sccache', 'InsignificantTests']
Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',