summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86/conanfiles
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-11-06 22:33:50 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2016-11-07 11:59:03 +0000
commit05f4779eaee7410188ee13ee2e20d1fb86c5a345 (patch)
treed5d96a127a22519f6468c6f495295367691c329c /coin/provisioning/qtci-windows-10-x86/conanfiles
parent829820f51a7997ff2c69c7931166c1762f4bf7d1 (diff)
Update package names and options in qtwebkit conanfiles
Task-number: QTQAINFRA-997 Change-Id: I19634c06041286fe44c787efe038d5ab24888b1f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/conanfiles')
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt15
1 files changed, 7 insertions, 8 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
index d1fcbfba..660bd24a 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
@@ -1,20 +1,19 @@
[requires]
-cmake_installer/0.1@lasote/testing
-icu/57.1@Vitallium/stable
-libxml2-qt/2.9.4@Vitallium/stable
-libxslt-qt/1.1.29@Vitallium/stable
+icu/57.1@vitallium/stable
+libxml2/2.9.4@vitallium/stable
+libxslt/1.1.29@vitallium/stable
[generators]
cmake
-virtualenv
[options]
-cmake_installer:version=3.5.2
icu:shared=True
-libxml2-qt:shared=False
-libxslt-qt:shared=False
+libxml2-qt:shared=True
+libxslt-qt:shared=True
[imports]
bin, icudt57.dll -> ./bin
bin, icuin57.dll -> ./bin
bin, icuuc57.dll -> ./bin
+bin, libxml2.dll -> ./bin
+bin, libxslt.dll -> ./bin