diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
| commit | 68189ab965784b5f83729e08de5f54965dc7cd32 (patch) | |
| tree | 5a9bfe72da0ee5b1ae5abca6c4854503efc06840 /coin/provisioning/common/windows/squishInstall.ps1 | |
| parent | 98cb5fa96506837f417d6c2cfdb9c6abe3223d52 (diff) | |
| parent | d690f84fd40beebcb9891df8bb656973daf55b22 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
Diffstat (limited to 'coin/provisioning/common/windows/squishInstall.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index de04d242..2cc45785 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -73,7 +73,9 @@ Function DownloadAndInstallSquish { Write-Host "Fetching from URL $squishUrl" Copy-Item "$SquishUrl" "$SquishInstaller" Write-Host "Installing Squish" - Run-Executable "$SquishInstaller" "$SquishParameters" + $stdoutFile = [System.IO.Path]::GetTempFileName() + $stderrFile = [System.IO.Path]::GetTempFileName() + Start-Process -FilePath "$SquishInstaller" -Wait -ArgumentList $SquishParameters -PassThru -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile | Out-Null Remove-Item -Path $SquishInstaller if ("$bit" -eq "win64") { if ($squishPackage.StartsWith("mingw")) { |