diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-30 16:13:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-30 16:13:52 +0200 |
| commit | 0e4688d36ea143b285e2ecf96073c83142bdfe41 (patch) | |
| tree | ffbf520c764e4942af7569b1341bf86ad56d16ee /coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | |
| parent | 2fb27862aa760d88790b23e0eab3cd3be5341054 (diff) | |
| parent | a5b6125466344f0f9b73691b97fbc809c5ad9f7f (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.gitmodules
Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt new file mode 100644 index 00000000..d1fcbfba --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -0,0 +1,20 @@ +[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 + +[generators] +cmake +virtualenv + +[options] +cmake_installer:version=3.5.2 +icu:shared=True +libxml2-qt:shared=False +libxslt-qt:shared=False + +[imports] +bin, icudt57.dll -> ./bin +bin, icuin57.dll -> ./bin +bin, icuuc57.dll -> ./bin |