summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-8.1-x86
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2018-01-29 13:53:08 +0100
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2018-01-29 14:06:05 +0100
commita434f14bd93f387f5f981fcd7d27ce95384d1ce6 (patch)
treeb5cc79dd41ef6dd3c49dafcf899d469574632123 /coin/provisioning/qtci-windows-8.1-x86
parent282899453d2c6b4c51bbd94fc228f2bb711d64f6 (diff)
parent351a519340d509300c754d0a62771a7f6e38ea4c (diff)
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts: coin/provisioning/common/linux/qnx_700.sh coin/provisioning/common/windows/libclang.ps1 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
Diffstat (limited to 'coin/provisioning/qtci-windows-8.1-x86')
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/90-squish.ps11
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-8.1-x86/90-squish.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-squish.ps1
new file mode 100644
index 00000000..ff758845
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/90-squish.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\squishInstall.ps1"