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/qtbase.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/qtbase.yaml')
-rw-r--r-- | coin/platform_configs/qtbase.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index af68635a..10c344c1 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -13,7 +13,7 @@ Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-windows-10-x86_64-10' + Template: 'qtci-windows-10-x86_64-16' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' |