diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-27 09:23:05 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-28 19:44:30 +0100 |
| commit | 63c515a6cbb002e96eea0134a77c380e5ef7b7c9 (patch) | |
| tree | 2322b3189c4ae04e1ac0c7fc21354e1fd59a8749 /coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 | |
| parent | 3ba8bdeda0fd23bec9de10cb4cf962b50a535af6 (diff) | |
| parent | 0d6ae070f44236fdceda6241e9564dba93c91d0b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Also update the Windows config to use MSVC2019 instead of 2017
to circumvent the issue that vcpkg is building libraries with the
latest compiler it finds (MSVC 2019), but Qt is building with 2017.
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtsaferenderer.yaml
Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" |