diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-09 10:33:56 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-14 07:24:32 +0000 |
commit | d615b4a99f2dcbdf464323b4c63f4f71b08b8c47 (patch) | |
tree | 0d809a18ab4cc1295ec473d3819b56d5ff0900df /coin/provisioning/qtci-windows-8-x86 | |
parent | bded0e1bbc43c1243b2d924f54862b5b7eb748ec (diff) | |
parent | bbf18ab4ad3d965f1512f64e7d3c49eeb5f3f8b3 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Remove QNX Windows builds, 0358b6d2
Remove Integrity build temporarily, QTBUG-61702
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
Diffstat (limited to 'coin/provisioning/qtci-windows-8-x86')
-rw-r--r-- | coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 | 2 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8-x86/08-libclang.ps1 | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 index 3bb0af0e..dfca166f 100644 --- a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 +++ b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" +. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-8-x86/08-libclang.ps1 new file mode 100644 index 00000000..cc8be923 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/08-libclang.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\libclang.ps1" 32 |