summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-08-06 11:46:15 +0200
committerLiang Qi <liang.qi@qt.io>2019-08-07 10:35:16 +0200
commitf8439ea42cc7462d4ea5eb216422ec42c11f47ac (patch)
tree7e7ea027376ad0dbf9f5f65ae18e03e0f30cde5f /coin/provisioning/qtci-windows-10-x86
parenta268fb46895f694a58da2389fd47ca393a68deef (diff)
parent13b206662bf3c3cb5eaf2e977d457fd1a7c3fa50 (diff)
Merge "Merge remote-tracking branch 'origin/5.13' into 5.13.1"
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86')
-rw-r--r--coin/provisioning/qtci-windows-10-x86/11-conan.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/03-conan.ps1)2
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt21
2 files changed, 16 insertions, 7 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/11-conan.ps1
index 75c6a232..d33ceea8 100644
--- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/11-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\windows\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
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