From f1c280f31f6a893c4d94090da15336580e5a7df1 Mon Sep 17 00:00:00 2001
From: Heikki Halmet <heikki.halmet@qt.io>
Date: Wed, 17 Nov 2021 11:41:42 +0200
Subject: [PATCH] Add support for Microsoct Visual Studio 2022 official release

MSVC2022_PREVIEW can be removed later when MSVC2022 official
release has been merged

Task-number: QTQAINFRA-4540
Pick-to: 6.2
Change-Id: I7756b53b1cd5863d21c1c1e3bb19373f6f0cf8fa
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
---
 coin/instructions/prepare_building_env.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml
index dd4ecf3868..c4d7b2bf59 100644
--- a/coin/instructions/prepare_building_env.yaml
+++ b/coin/instructions/prepare_building_env.yaml
@@ -208,6 +208,13 @@ instructions:
           condition: property
           property: host.compiler
           equals_value: MSVC2022_PREVIEW
+      - type: EnvironmentVariable
+        variableName: VC_SCRIPT
+        variableValue: "%ProgramFiles%\\Microsoft Visual Studio\\2022\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+        enable_if:
+          condition: property
+          property: host.compiler
+          equals_value: MSVC2022
 
 
   # With MSVC we need setup the environment before every subprocess call, the group below creates a script that