diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
| commit | def11da274cc4af1ba15bdc43fe7aac74bb40d49 (patch) | |
| tree | 65523361f6e2371f135abb0c0b7c40a9f808b05f /coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | |
| parent | 44eaaf374a2c4cc0e370f84c561a7aaaa23f4096 (diff) | |
| parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
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 | 6 |
1 files changed, 3 insertions, 3 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 30979954..a7ced8ae 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -13,8 +13,8 @@ libxml2:shared=True libxslt:shared=True [imports] -bin, icudt57.dll -> ./bin -bin, icuin57.dll -> ./bin -bin, icuuc57.dll -> ./bin +bin, icudt59.dll -> ./bin +bin, icuin59.dll -> ./bin +bin, icuuc59.dll -> ./bin bin, libxml2.dll -> ./bin bin, libxslt.dll -> ./bin |