summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86/conanfiles
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2019-07-26 18:57:59 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2019-07-26 19:52:45 +0300
commit716640a4770c8e11ab5f6e6ebb8db64868c2679b (patch)
treea706c8e592f629a87cb99c72171409a8207319a6 /coin/provisioning/qtci-windows-10-x86/conanfiles
parent4bf0ba2ba18e0caf2e4e99ab68a1f506a9eb3705 (diff)
Provisioning: update Conan and Conan packages
[*] Update Conan to 1.17.0, adjust to change in command line arguments [*] Update Conan packages to up-to-date versions, add libjpeg-turbo and packages for 64-bit MinGW [*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after Python 3 and MinGW [*] Add license header to conan.ps1 Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/conanfiles')
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt21
1 files changed, 15 insertions, 6 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
index a7ced8ae..0c910ea2 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
@@ -1,7 +1,8 @@
[requires]
-icu/59.1@vitallium/stable
-libxml2/2.9.4@vitallium/stable
-libxslt/1.1.29@vitallium/stable
+icu/64.2@qtproject/stable
+libxml2/2.9.9@qtproject/stable
+libxslt/1.1.33@qtproject/stable
+libjpeg-turbo/2.0.2@qtproject/stable
[generators]
cmake
@@ -9,12 +10,20 @@ txt
[options]
icu:shared=True
+icu:data_packaging=library
+
libxml2:shared=True
+libxml2:iconv=False
+libxml2:icu=True
+libxml2:zlib=False
+
libxslt:shared=True
+libjpeg-turbo:shared=False
+
[imports]
-bin, icudt59.dll -> ./bin
-bin, icuin59.dll -> ./bin
-bin, icuuc59.dll -> ./bin
+lib, icudt64.dll -> ./bin
+lib, icuin64.dll -> ./bin
+lib, icuuc64.dll -> ./bin
bin, libxml2.dll -> ./bin
bin, libxslt.dll -> ./bin