diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2020-09-14 11:43:35 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2020-11-12 07:23:14 +0200 |
| commit | 746a0e5476daf239816d85d97a219bd01a2e7738 (patch) | |
| tree | 2930ad63d281b5de764cd9af5a4e2d46d8e7331f /coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 | |
| parent | f0c314d4d493e2074e0d1933ff9e9bb96ab9c0e2 (diff) | |
Provisioning: Update Conan packages
* Update libjpeg-turbo to 2.0.5
* Replace MinGW 7 packages with MinGW 8
* Remove zlib packages as Qt is consistently built with -qt-zlib now
Task-bumber: QTQAINFRA-3916
Change-Id: Ie15bbb0f0f5b3a4c1a5d08f2341e9eb16a80cce7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c79904c463842937f6b2cc959454d2f59943a08e)
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
(cherry picked from commit 27d187eb3259842d506bb8e35691aa4748f99025)
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 index 71abc7e1..09c5b21c 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 @@ -50,20 +50,20 @@ Run-Conan-Install ` Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86 ` + -BuildinfoDir Mingw-x86 ` -Arch x86 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "dwarf2" ` -CompilerThreads "posix" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86_64 ` + -BuildinfoDir Mingw-x86_64 ` -Arch x86_64 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "seh" ` -CompilerThreads "posix" |