qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Heikki Halmet 2018-02-28 13:34:15 +02:00 committed by Liang Qi
parent 95609c6657
commit 3410bab278
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coin/provisioning/common/windows/squishInstall.ps1
View File

@ -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
}