aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-11-23 11:14:15 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2016-11-23 08:46:30 +0000
commit8114c71554f825c14abe0e578ca06e1598f9e305 (patch)
treeac168a337f8a32138b650b331c256a186b100f81 /coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
parent0f8f2edbbbe886c19ecc3980acdf54d5671b01d0 (diff)
Added conan zlib package for MinGW on Windows 7
Change-Id: I48d904e95fce905b15b0099fee956c06773c4a75 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt')
-rw-r--r--coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
index 694258bd..4253ef09 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
@@ -2,6 +2,7 @@
icu/57.1@annulen/stable
libxml2/2.9.4@annulen/stable
libxslt/1.1.29@annulen/stable
+zlib/1.2.8@annulen/stable
[generators]
cmake
@@ -10,6 +11,7 @@ cmake
icu:shared=True
libxml2:shared=True
libxslt:shared=True
+zlib:shared=False
[imports]
lib, icudt57.dll -> ./bin