aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/windows/squishInstall.ps1
diff options
context:
space:
mode:
authorJoni Jantti <joni.jantti@qt.io>2018-02-14 11:56:52 +0200
committerLiang Qi <liang.qi@qt.io>2018-04-18 18:16:18 +0000
commit18b2d88dd5215a871104712acafdcb4f47ac9c86 (patch)
tree8a6115da8dc9cd1e1e0fe82dc870c09855c9d36f /coin/provisioning/common/windows/squishInstall.ps1
parent0f25c861f8ad1516a1bcce22f0a3cd9c76be331e (diff)
Provisioning: Win7-x86 - Add msvc14_x86 squish package
Squish is required by RTA testing. Task-number: QTQAINFRA-1732 Change-Id: I8ab0b11ccc299cc0b10e59f99d1cf27c0cdd48b9 (cherry picked from commit f6f00fdce1f3f00775e8b399dc8813883af5bf90) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> 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.ps13
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index 7641c9fe..7a5824df 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -152,6 +152,9 @@ else
$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"