diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-07 10:35:16 +0200 |
| commit | f8439ea42cc7462d4ea5eb216422ec42c11f47ac (patch) | |
| tree | 7e7ea027376ad0dbf9f5f65ae18e03e0f30cde5f /coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt | |
| parent | a268fb46895f694a58da2389fd47ca393a68deef (diff) | |
| parent | 13b206662bf3c3cb5eaf2e977d457fd1a7c3fa50 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.13.1"
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt index 4a5bc05d..7a5a892a 100644 --- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt @@ -1,8 +1,9 @@ [requires] -icu/57.1@annulen/stable -libxml2/2.9.4@annulen/stable -libxslt/1.1.29@annulen/stable -zlib/1.2.8@annulen/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 +zlib/1.2.11@qtproject/stable [generators] cmake @@ -10,13 +11,22 @@ 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 + zlib:shared=False [imports] -lib, icudt57.dll -> ./bin -lib, icuin57.dll -> ./bin -lib, icuuc57.dll -> ./bin +lib, icudt64.dll -> ./bin +lib, icuin64.dll -> ./bin +lib, icuuc64.dll -> ./bin bin, libxml2-2.dll -> ./bin bin, libxslt-1.dll -> ./bin |