diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-16 23:14:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-16 23:14:25 +0100 |
| commit | 062b29b311cc87f438d7a6d5d5b5bfb8142fb7df (patch) | |
| tree | efd30f31dc86008734d902673309215377aedffe /coin/provisioning/qtci-windows-10-x86 | |
| parent | 26fda37639ce3c062eba550c9d87dc367b2b1c0c (diff) | |
| parent | 329d718a1910f7b8e53b9d2feea2dc7a64b54adb (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iac3073d85bd94d27c296b307a827ee6bd97c4194
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index 30979954..a7ced8ae 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/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 |