diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-07-06 17:49:00 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-09 04:51:54 +0000 |
| commit | dd5096c6c7b9c48524096cfda8b56b8619c82ea2 (patch) | |
| tree | 7641f224ca937aa7aaf2a54f670af8bbed4c5dd3 /coin/provisioning/qtci-windows-10-x86 | |
| parent | 6837a847bb89db903a81ae37962c3670938d49ff (diff) | |
Conan: update ICU to 59.1, added VS2017 packages
MinGW packages will be upgraded in another patch.
Task-number: QTBUG-61728
Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/03-conan.ps1 | 8 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 index 4ba6c70c..2fc36311 100644 --- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 @@ -7,3 +7,11 @@ Run-Conan-Install ` -Compiler "Visual Studio" ` -CompilerVersion 14 ` -CompilerRuntime MD + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2017-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 15 ` + -CompilerRuntime MD diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index fe3c3e96..30979954 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -1,5 +1,5 @@ [requires] -icu/57.1@vitallium/stable +icu/59.1@vitallium/stable libxml2/2.9.4@vitallium/stable libxslt/1.1.29@vitallium/stable |