diff options
author | Liang Qi <liang.qi@qt.io> | 2019-09-23 16:38:06 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-23 16:38:06 +0200 |
commit | 44073f55632e7848d372a60c4417bbc8664afd2c (patch) | |
tree | 6fcebed721da0d0049ae1413538e8f6bf9dfbf92 /coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | |
parent | 709e687c84c67ba8faf2411c081b29f25d76de4e (diff) | |
parent | fd87ff83aafc0f103538376591e9f36dfeb1410d (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
.gitmodules
coin/platform_configs/default.txt
Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
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 |