summaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2018-02-28 13:34:15 +0200
committerLiang Qi <liang.qi@qt.io>2018-03-08 19:27:14 +0000
commit3410bab2783875403e43ae8875901da3605ece23 (patch)
treed47740a78ecd545847659803df6764c86526c5c3 /coin
parent95609c6657dd08cb96fadf55927f62788a56b82e (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>
Diffstat (limited to 'coin')
-rw-r--r--coin/provisioning/common/windows/squishInstall.ps16
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index 504b0077..31ae8264 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -147,12 +147,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
}