aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2022-02-01 15:06:49 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-04 15:48:11 +0000
commitecc9f2f425a5c74115e1944a9b5672d54cd880de (patch)
tree2d44f2663ee13862cd3a4d7b28be3cab9a20df1c
parent75a52c9eec45a0cad4c64f6e8e5c0fb0f209ab82 (diff)
Remove old Windows 10 targets
Windows 10 21H2 is now significant for all targets Task-number: QTQAINFRA-4539 Change-Id: I9435c11f7df6b7c2c77a5af10ebc5e0da5717ccb Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit ac2bdfb93a84f07d3fb4ed9edce8409dcabcac1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml46
-rw-r--r--coin/platform_configs/cmake_platforms_target_android_host_windows.yaml56
-rw-r--r--coin/platform_configs/cmake_platforms_wasm.yaml12
-rw-r--r--coin/platform_configs/qt-creator.yaml7
-rw-r--r--coin/platform_configs/qtsaferenderer.yaml6
-rw-r--r--coin/platform_configs/qtwebkit.yaml6
6 files changed, 0 insertions, 133 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 0a0ddb55..74849103 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -54,14 +54,6 @@ Configurations:
Features: ['Sccache', 'DisableTests']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
- Template: 'qtci-windows-10-x86_64-52'
- Compiler: 'MSVC2019'
- Features: ['Packaging', 'Sccache', "DebugAndRelease"]
- Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
- Environment variables: [
- 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
- 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64']
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease"]
@@ -97,25 +89,6 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
- Id: 'Windows10-MSVC2019-x64-host'
- Template: 'qtci-windows-10-x86_64-52'
- Compiler: 'MSVC2019'
- Features: ['Sccache', "DebugAndRelease"]
- Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
--
- Template: 'qtci-windows-10-x86_64-52'
- Compiler: 'MSVC2019'
- Target arch: 'arm64'
- Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
- Platform dependency: 'Windows10-MSVC2019-x64-host'
- Environment variables: [
- 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64',
- 'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64',
- 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
- 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
- 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}']
--
Id: 'Windows10_21H2-MSVC2019-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
@@ -174,17 +147,6 @@ Configurations:
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang']
-
- Id: 'Windows10-Mingw11-x64-host'
- Template: 'qtci-windows-10-x86_64-52'
- Compiler: 'Mingw'
- Features: ['Packaging', 'Sccache']
- Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
- Environment variables: [
- 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
- 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
- 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
- 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw']
--
Id: 'Windows10_21H2-Mingw11-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
@@ -196,14 +158,6 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw']
-
- Id: 'Windows10-LLVM-x64-host'
- Template: 'qtci-windows-10-x86_64-52'
- Compiler: 'Clang'
- Features: ['Sccache']
- Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
- Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
- 'LLVM_INSTALL_DIR=C:\llvm-mingw']
--
Id: 'Windows10_21H2-LLVM-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Clang'
diff --git a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
index 53691a97..05e28ac6 100644
--- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
@@ -1,20 +1,6 @@
Version: 2
Configurations:
-
- Template: 'qtci-windows-10-x86_64-52'
- Target os: 'Android_ANY'
- Target arch: 'arm64'
- Compiler: 'Mingw'
- Target compiler: 'Clang'
- Platform dependency: 'Windows10-Mingw11-x64-host'
- Features: ['Packaging', 'Sccache', 'DisableTests']
- Environment variables: [
- 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
- 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
- 'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang'
- ]
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'arm64'
@@ -29,20 +15,6 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang'
]
-
- Template: 'qtci-windows-10-x86_64-52'
- Target os: 'Android_ANY'
- Target arch: 'armv7'
- Compiler: 'Mingw'
- Target compiler: 'Clang'
- Platform dependency: 'Windows10-Mingw11-x64-host'
- Features: ['Packaging', 'Sccache', 'DisableTests']
- Environment variables: [
- 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
- 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
- 'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang'
- ]
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'armv7'
@@ -57,20 +29,6 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang'
]
-
- Template: 'qtci-windows-10-x86_64-52'
- Target os: 'Android_ANY'
- Target arch: 'x86'
- Compiler: 'Mingw'
- Target compiler: 'Clang'
- Platform dependency: 'Windows10-Mingw11-x64-host'
- Features: ['Packaging', 'Sccache', 'DisableTests']
- Environment variables: [
- 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
- 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
- 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang'
- ]
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86'
@@ -85,20 +43,6 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang'
]
-
- Template: 'qtci-windows-10-x86_64-52'
- Target os: 'Android_ANY'
- Target arch: 'x86_64'
- Compiler: 'Mingw'
- Target compiler: 'Clang'
- Platform dependency: 'Windows10-Mingw11-x64-host'
- Features: ['Packaging', 'Sccache', 'DisableTests']
- Environment variables: [
- 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
- 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
- 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang'
- ]
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86_64'
diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml
index 07ca747a..a161f706 100644
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -11,18 +11,6 @@ Configurations:
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
]
-
- Template: 'qtci-windows-10-x86_64-52'
- Target os: 'WebAssembly'
- Compiler: 'Mingw'
- Target compiler: 'Clang'
- Platform dependency: 'Windows10-Mingw11-x64-host'
- Features: ['Packaging', 'Sccache', 'DisableTests']
- Environment variables: [
- 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
- 'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
- 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
- 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF']
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'WebAssembly'
Compiler: 'Mingw'
diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml
index 52ac445f..5bb538e4 100644
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -2,13 +2,6 @@ Version: 2
Module only: True
Configurations:
-
- Template: 'qtci-windows-10-x86_64-52'
- Compiler: 'MSVC2019'
- Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
- Configure arguments: ''
- Environment variables: []
- Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
index 795bd26d..fde65967 100644
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -7,12 +7,6 @@ Configurations:
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
Features: ['UseLegacyInstructions']
-
- Template: 'qtci-windows-10-x86_64-52'
- Compiler: 'Mingw'
- Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
- Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml
index 7866010b..c6e10e45 100644
--- a/coin/platform_configs/qtwebkit.yaml
+++ b/coin/platform_configs/qtwebkit.yaml
@@ -1,12 +1,6 @@
Version: 2
Configurations:
-
- Template: 'qtci-windows-10-x86_64-52'
- Compiler: 'Mingw'
- Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
- Features: ['Packaging', UseLegacyInstructions']
- Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s'
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']