diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2018-02-28 13:34:15 +0200 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-04-20 06:15:55 +0000 |
| commit | 0d19fb2955beb0ffe85b6473963859677ac30df5 (patch) | |
| tree | 6dacf6d5959998448ed438a48ccc4d32261c5b90 /coin | |
| parent | 73621de8916b5d6d17a1dbd24c134d14c1c726a8 (diff) | |
Provisioning: Fix Squish installation for msvc14 32-bit
Task-number: QTQAINFRA-1809
Change-Id: I8a2947fe52535e39b0817fec2ee0c35bb09e4060
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
(cherry picked from commit 3410bab2783875403e43ae8875901da3605ece23)
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 62820676..372f08c9 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -148,12 +148,12 @@ if ($OSVersion -eq "Windows 7 Enterprise") { $squishPackage = "msvc14" $squishPackage64bit = "msvc14_64" - Write-Host "Installing $squishPackage" - DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage - if (Is64BitWinHost) { Write-Host "Installing $squishPackage64bit" DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit } + + Write-Host "Installing $squishPackage" + DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage } |