diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-02 09:01:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-02 09:02:23 +0100 |
| commit | 2c27ccd1c9a821edd071cae6336ecb2066ce2ab7 (patch) | |
| tree | faabf3a283501256bd3c4065273a651174657736 /coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | |
| parent | aed00a8dd39786519bdf5b6f5627cad6c006a8ce (diff) | |
| parent | d379d768e6b9e6d9b432117ad8c803ce7ed9e7e5 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8.0
Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | 16 |
1 files changed, 8 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..fe3c3e96 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -1,20 +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 +icu/57.1@vitallium/stable +libxml2/2.9.4@vitallium/stable +libxslt/1.1.29@vitallium/stable [generators] cmake -virtualenv +txt [options] -cmake_installer:version=3.5.2 icu:shared=True -libxml2-qt:shared=False -libxslt-qt:shared=False +libxml2:shared=True +libxslt:shared=True [imports] bin, icudt57.dll -> ./bin bin, icuin57.dll -> ./bin bin, icuuc57.dll -> ./bin +bin, libxml2.dll -> ./bin +bin, libxslt.dll -> ./bin |