From 35b431cb9e46bcab29240c555e652f4f9cab0895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 25 May 2020 09:12:05 +0000 Subject: Remove Windows 7 builds from Qt6 Task-number: QTQAINFRA-3750 Change-Id: Iea7ccca4695ce3f72547044ee2371c761f026eb4 Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.yaml | 6 ------ coin/platform_configs/qt5.yaml | 6 ------ coin/platform_configs/qtqa.yaml | 7 ------- coin/platform_configs/qtwebkit.yaml | 6 ------ coin/platform_configs/tqtc-qt-rta.yaml | 6 ------ 5 files changed, 31 deletions(-) delete mode 100644 coin/platform_configs/qtqa.yaml (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index b527e692..9b6f6107 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,11 +1,5 @@ Version: 2 Configurations: -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw' - Features: ['UseLegacyInstructions'] - Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib' - Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 49b6b392..1d77acd1 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,12 +1,6 @@ Version: 2 Include: [cmake_platforms.yaml] Configurations: -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - Template: 'qtci-windows-10-x86_64-17' Compiler: 'Mingw' diff --git a/coin/platform_configs/qtqa.yaml b/coin/platform_configs/qtqa.yaml deleted file mode 100644 index ec8c3214..00000000 --- a/coin/platform_configs/qtqa.yaml +++ /dev/null @@ -1,7 +0,0 @@ -Version: 2 -Configurations: -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' - Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 9b2ae381..aa2b40a8 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -1,11 +1,5 @@ Version: 2 Configurations: -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] - Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-windows-10-x86_64-17' Compiler: 'Mingw' diff --git a/coin/platform_configs/tqtc-qt-rta.yaml b/coin/platform_configs/tqtc-qt-rta.yaml index 175524b2..b84db6ce 100644 --- a/coin/platform_configs/tqtc-qt-rta.yaml +++ b/coin/platform_configs/tqtc-qt-rta.yaml @@ -1,9 +1,3 @@ -- - Template: 'qtci-windows-7-x86_64-4' - Compiler: 'MSVC2013' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' -- Template: 'qtci-windows-8.1-x86_64' Compiler: 'MSVC2013' Features: ['DisableTests', 'UseLegacyInstructions'] -- cgit v1.2.3