diff options
| author | Joni Jantti <joni.jantti@qt.io> | 2018-02-14 11:56:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-23 21:00:29 +0000 |
| commit | f6f00fdce1f3f00775e8b399dc8813883af5bf90 (patch) | |
| tree | 7eb3eb5f6ea1546a62dffbef514f63814aea7a3c /coin/provisioning/common/windows/squishInstall.ps1 | |
| parent | f6f5cc70e9a19cae8c144ab5f2c3d79f2302f6e8 (diff) | |
Provisioning: Win7-x86 - Add msvc14_x86 squish package
Squish is required by RTA testing.
Task-number: QTQAINFRA-1732
Change-Id: I8ab0b11ccc299cc0b10e59f99d1cf27c0cdd48b9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows/squishInstall.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index c4d56e07..509eb93f 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -158,6 +158,9 @@ if($OSVersion -eq "Windows 7") $squishPackage = "msvc14" $squishPackage64bit = "msvc14_64" + echo "Installing $squishPackage" + DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage + if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { echo "Installing $squishPackage64bit" |