diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-02 12:14:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-03 00:08:09 +0200 |
| commit | 689ed30f2a0a05f7aba7debeb2554bb8baaa3544 (patch) | |
| tree | d8405a9848a24535aa86951305bdef035e4a7cc8 /coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | |
| parent | 4c5d3f2e43008da3e7e96e7cbed31bc3bbf6cfab (diff) | |
| parent | a94696ccd5be936099809eda58db02999cb7c77a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index a7ced8ae..0c910ea2 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -1,7 +1,8 @@ [requires] -icu/59.1@vitallium/stable -libxml2/2.9.4@vitallium/stable -libxslt/1.1.29@vitallium/stable +icu/64.2@qtproject/stable +libxml2/2.9.9@qtproject/stable +libxslt/1.1.33@qtproject/stable +libjpeg-turbo/2.0.2@qtproject/stable [generators] cmake @@ -9,12 +10,20 @@ txt [options] icu:shared=True +icu:data_packaging=library + libxml2:shared=True +libxml2:iconv=False +libxml2:icu=True +libxml2:zlib=False + libxslt:shared=True +libjpeg-turbo:shared=False + [imports] -bin, icudt59.dll -> ./bin -bin, icuin59.dll -> ./bin -bin, icuuc59.dll -> ./bin +lib, icudt64.dll -> ./bin +lib, icuin64.dll -> ./bin +lib, icuuc64.dll -> ./bin bin, libxml2.dll -> ./bin bin, libxslt.dll -> ./bin |