diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:34:28 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:34:28 +0100 |
| commit | 485244b016172445aa20bd31fb84fec6b7724cf5 (patch) | |
| tree | cf2a40fea5517379e56e624bcb27936873546f1e /coin/provisioning/qtci-windows-8.1-x86_64 | |
| parent | 3504be0d83cdfb565ee5e3c043c33c54dacbfa54 (diff) | |
| parent | 00e31823d35eecfa6ee265b1ccdb563dfe1b905f (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10.1
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.
Change-Id: Ia5d2e6f7079162f571cd7c7994c0f2b3133b1163
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-8.1-x86_64')
| -rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/90-squish.ps1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/90-squish.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/90-squish.ps1 new file mode 100644 index 00000000..ff758845 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/90-squish.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\squishInstall.ps1" |