diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-20 14:07:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-21 05:56:56 +0200 |
| commit | eb7370a7afb6c61b7bff0a71d8d19f4dbbe34bef (patch) | |
| tree | c5f319b851ce3c76664cd27133bfb874f265abd7 /coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | |
| parent | c63dd0ddfdf1467e2f08cb1c9769142be1420ca5 (diff) | |
| parent | 9a8fb868ec2c526325408a4cbf3e628aa3377e30 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
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 | 23 |
1 files changed, 17 insertions, 6 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 index a7ced8ae..4d9ca4b9 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/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,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 + [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 +bin, libxml2-2.dll -> ./bin +bin, libxslt-1.dll -> ./bin |