aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt15
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt15
2 files changed, 14 insertions, 16 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
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
index d1fcbfba..660bd24a 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-10-x86_64/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