diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-03 14:40:41 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-03 14:40:41 +0200 |
| commit | 2d577a83ecdcddcfbdf52dc01984e9313ad8b898 (patch) | |
| tree | 5df9b21074008c86a82fd849286dd236900fcf09 /coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 | |
| parent | 52068b49e837ec840ef3fe14a7da21268fbc6cd5 (diff) | |
| parent | ec7bf6356ccbdaf14f5274e36f49d73013fc5a06 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
Change-Id: I34cf4fb6818c17872e55f36149e8f91871d2aea1
Diffstat (limited to 'coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 new file mode 100644 index 00000000..a9044256 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" |