mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-06 20:35:59 +08:00
Remove duplicate MinGW environment variables
Change-Id: I2018b0c46b9708f699e5da6155e95151a49394fb
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 5ce8c724d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
4e7f922835
commit
1f2aef79bf
@@ -224,7 +224,6 @@ Configurations:
|
||||
-
|
||||
Template: 'qtci-windows-10_21H2-x86_64-51'
|
||||
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',
|
||||
@@ -232,7 +231,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',
|
||||
|
||||
Reference in New Issue
Block a user