From 34cf0234b9fa47cedacd2c2408f80b3bbf1c12c1 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 20 Feb 2018 14:51:05 +0200 Subject: Provisioning: Win10 - Add Squish for mingw53 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RTA requires Squish for mingw53 on Windows 10 machines for testing. Task-number: QTQAINFRA-1729 Change-Id: I42f2c6c62dd004ebc072835340ce24105cfac5e8 (cherry picked from commit 5e31866727b4485f07a17295277be889305c4b3b) Reviewed-by: Jani Heikkinen Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/squishInstall.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 7a5824df..9128c683 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -107,6 +107,12 @@ DownloadSquishLicence $licensePackage $squishUrl $targetDir if(($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 8.1 Enterprise")) { + # Squish for MinGW + $squishPackageMingw = "mingw_gcc53_posix_dwarf" + echo "Installing $squishPackageMingw" + DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw + mv $targetDir\$squishPackageMingw $targetDir\mingw + # Squish for Visual Studio 2015 $squishPackage = "msvc14" $squishPackage64bit = "msvc14_64" -- cgit v1.2.3