diff options
author | Toni Saario <toni.saario@qt.io> | 2020-07-23 07:59:39 +0300 |
---|---|---|
committer | Simo Fält <simo.falt@qt.io> | 2020-10-26 06:15:25 +0000 |
commit | 5bb33f606e226e33169e5b8d3c954e7729f48179 (patch) | |
tree | a3d7ea30d5411d58d04383329060a7c94ba2f37a /coin/platform_configs/qtsaferenderer.yaml | |
parent | c9d7845744bef34a33c31a6a4000736277d20bc8 (diff) |
Update windows tier1 image
Changes in coin to virtual machine template exposed a bug where older
windows version deadlocks jom in multithreaded environment.
-16 version of the windows 10 image is latest to include msvc2017,
update to this.
Task-number: COIN-598
Change-Id: Icc75ad4a6029332ebcd4acaad563156a139dc280
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 573c35b1646377117765dbe754980e64beda2988)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'coin/platform_configs/qtsaferenderer.yaml')
-rw-r--r-- | coin/platform_configs/qtsaferenderer.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 14e0e953..9dae5523 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,9 +1,9 @@ - - Template: 'qtci-windows-10-x86_64-10' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'Mingw73' Configure arguments: '-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++' - - Template: 'qtci-windows-10-x86_64-10' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] Configure arguments: '-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++' |