diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
| commit | ff8220f9f67ce7aa166a083d50d937578ab6a9db (patch) | |
| tree | 320f7b362b0f59c382546fc98172cc61c811ce95 /coin/provisioning/common/windows/vc_redist.ps1 | |
| parent | 38b6cbfd4261433548674aa4d109fff8a007c636 (diff) | |
| parent | 577d01e9dfaa9e69608097c550bd1877b5a9b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
.gitmodules
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/platform_configs/qtbase.txt
Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
Diffstat (limited to 'coin/provisioning/common/windows/vc_redist.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/vc_redist.ps1 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1 index f68846f0..1cd81a37 100644 --- a/coin/provisioning/common/windows/vc_redist.ps1 +++ b/coin/provisioning/common/windows/vc_redist.ps1 @@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 Write-Host "Installing $package..." Run-Executable $package "/q" -Write-Host "Remove $package..." -Remove-Item -Force -Path $package +Remove $package |