From 0d19fb2955beb0ffe85b6473963859677ac30df5 Mon Sep 17 00:00:00 2001
From: Heikki Halmet <heikki.halmet@qt.io>
Date: Wed, 28 Feb 2018 13:34:15 +0200
Subject: [PATCH] Provisioning: Fix Squish installation for msvc14 32-bit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
(cherry picked from commit 3410bab2783875403e43ae8875901da3605ece23)
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 coin/provisioning/common/windows/squishInstall.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index 62820676..372f08c9 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -148,12 +148,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
 }