SquishTests: Provide new settings for Windowsv16.0.0-beta2

Change-Id: I9b7df60427c60f57f55fe3d163a0c5cea189150f
Reviewed-by: Jukka Nokso <[email protected]>
Reviewed-by: Christian Stenger <[email protected]>

14 files changed, 414 insertions, 31 deletions

diff --git a/tests/system/settings/windows2022/QtProject/QtCreator.ini b/tests/system/settings/windows2022/QtProject/QtCreator.ini
new file mode 100644
index 00000000000..b77fccec036
--- /dev/null
+++ b/tests/system/settings/windows2022/QtProject/QtCreator.ini
@@ -0,0 +1,2 @@
+[%General]
+OverrideLanguage=C
diff --git a/tests/system/settings/windows2022/QtProject/qtcreator/debuggers.xml b/tests/system/settings/windows2022/QtProject/qtcreator/debuggers.xml
new file mode 100644
index 00000000000..efb946f2bcd
--- /dev/null
+++ b/tests/system/settings/windows2022/QtProject/qtcreator/debuggers.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorDebuggers>
+<!-- Written by QtCreator 4.2.2, 2017-02-10T17:36:35. -->
+<qtcreator>
+ <data>
+  <variable>DebuggerItem.0</variable>
+  <valuemap type="QVariantMap">
+   <valuelist type="QVariantList" key="Abis">
+    <value type="QString">x86-windows-msys-pe-unknown</value>
+   </valuelist>
+   <value type="bool" key="AutoDetected">false</value>
+   <value type="QString" key="AutoDetectionSource"></value>
+   <value type="QString" key="Binary">C:/Qt/Tools/mingw1120_64/bin/gdb.exe</value>
+   <value type="QString" key="DisplayName">gdb 11.2</value>
+   <value type="int" key="EngineType">1</value>
+   <value type="QString" key="Id">{2f8a1f59-ddd7-49f0-ae61-1337223f56a3}</value>
+   <value type="QString" key="Version">11.2.0</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>DebuggerItem.Count</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">1</value>
+ </data>
+</qtcreator>
diff --git a/tests/system/settings/windows2022/QtProject/qtcreator/devices.xml b/tests/system/settings/windows2022/QtProject/qtcreator/devices.xml
new file mode 100644
index 00000000000..70eaf23f6b2
--- /dev/null
+++ b/tests/system/settings/windows2022/QtProject/qtcreator/devices.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorDevices>
+<!-- Written by Qt Creator 2.5.83, 2012-09-21T18:26:34. -->
+<qtcreator>
+ <data>
+  <variable>DeviceManager</variable>
+  <valuemap type="QVariantMap">
+   <valuemap type="QVariantMap" key="DefaultDevices">
+    <value type="QString" key="Desktop">Desktop Device</value>
+   </valuemap>
+   <valuelist type="QVariantList" key="DeviceList">
+    <valuemap type="QVariantMap">
+     <value type="int" key="Authentication">1</value>
+     <value type="QString" key="FreePortsSpec"></value>
+     <value type="QString" key="Host"></value>
+     <value type="QByteArray" key="InternalId">Desktop Device</value>
+     <value type="QString" key="KeyFile"></value>
+     <value type="QString" key="Name">Run locally</value>
+     <value type="int" key="Origin">1</value>
+     <value type="QString" key="OsType">Desktop</value>
+     <value type="QString" key="Password"></value>
+     <value type="int" key="SshPort">0</value>
+     <value type="int" key="Timeout">0</value>
+     <value type="int" key="Type">0</value>
+     <value type="QString" key="Uname"></value>
+    </valuemap>
+   </valuelist>
+  </valuemap>
+ </data>
+</qtcreator>
diff --git a/tests/system/settings/windows2022/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows2022/QtProject/qtcreator/profiles.xml
new file mode 100644
index 00000000000..0710f142a7f
--- /dev/null
+++ b/tests/system/settings/windows2022/QtProject/qtcreator/profiles.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProfiles>
+<qtcreator>
+ <data>
+  <variable>Profile.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="PE.Profile.AutoDetected">false</value>
+   <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
+   <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
+    <value type="QString" key="Debugger.Information">{2f8a1f59-ddd7-49f0-ae61-1337223f56a3}</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
+    <valuelist type="QVariantList" key="PE.Profile.Environment"/>
+    <value type="QString" key="PE.Profile.SysRoot"></value>
+    <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb}</value>
+    <valuemap type="QVariantMap" key="PE.Profile.ToolChainsV3">
+     <value type="QByteArray" key="C">{777132b1-5d59-4adf-ab0d-3a6df2a0a0fb}</value>
+     <value type="QByteArray" key="Cxx">{44d54392-22ee-4eac-a9f1-2d882ba8a7bb}</value>
+    </valuemap>
+    <value type="QString" key="QtPM4.mkSpecInformation"></value>
+    <value type="int" key="QtSupport.QtInformation">22</value>
+   </valuemap>
+   <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
+   <value type="QString" key="PE.Profile.Id">{10cf33c5-e36d-4a49-a8c7-086f3cf59695}</value>
+   <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
+   <value type="QString" key="PE.Profile.Name">Desktop 6.7.3 GCC</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
+   <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
+  </valuemap>
+ </data>
+ <data>
+  <variable>Profile.1</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="PE.Profile.AutoDetected">false</value>
+   <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
+   <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
+    <valuelist type="QVariantList" key="PE.Profile.Environment"/>
+    <value type="QString" key="PE.Profile.SysRoot"></value>
+    <valuemap type="QVariantMap" key="PE.Profile.ToolChainsV3">
+     <value type="QByteArray" key="C">{4580fc7c-8102-4144-a808-749b1a29f739}</value>
+     <value type="QByteArray" key="Cxx">{c6590889-1d34-4d12-af47-51ec76305e88}</value>
+    </valuemap>
+    <value type="QString" key="QtPM4.mkSpecInformation"></value>
+    <value type="int" key="QtSupport.QtInformation">24</value>
+   </valuemap>
+   <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
+   <value type="QString" key="PE.Profile.Id">{f9c7858c-d167-4b78-847a-91943bd0af07}</value>
+   <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
+   <value type="QString" key="PE.Profile.Name">Desktop 5.14.1 default</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
+   <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
+  </valuemap>
+ </data>
+ <data>
+  <variable>Profile.2</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="PE.Profile.AutoDetected">false</value>
+   <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
+   <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString"></value>
+    <value type="QString" key="Android.GdbServer.Information"></value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
+    <valuelist type="QVariantList" key="PE.Profile.Environment">
+     <value type="QString">SQUISH_ENV_MODIFICATION</value>
+    </valuelist>
+    <value type="QString" key="PE.Profile.SysRoot"></value>
+    <valuemap type="QVariantMap" key="PE.Profile.ToolChainsV3">
+     <value type="QByteArray" key="C">{c96cfaf3-fb8a-472b-b3c7-e94e8c490f17}</value>
+     <value type="QByteArray" key="Cxx">{ed856706-2a9d-4745-9d85-4e322b6f91d4}</value>
+    </valuemap>
+    <value type="QString" key="QtPM4.mkSpecInformation"></value>
+    <value type="int" key="QtSupport.QtInformation">26</value>
+   </valuemap>
+   <value type="QString" key="PE.Profile.Icon"></value>
+   <value type="QString" key="PE.Profile.Id">{37fad24d-07f3-442e-8c65-d9ded3633f7e}</value>
+   <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
+   <value type="QString" key="PE.Profile.Name">Desktop 5.10.1 default</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
+   <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
+  </valuemap>
+ </data>
+ <data>
+  <data>
+  <variable>Profile.3</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="PE.Profile.AutoDetected">false</value>
+   <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
+   <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.DeviceType">Desktop</value>
+    <valuemap type="QVariantMap" key="PE.Profile.ToolChainsV3">
+     <value type="QByteArray" key="C">{4580fc7c-8102-4144-a808-749b1a29f739}</value>
+     <value type="QByteArray" key="Cxx">{c6590889-1d34-4d12-af47-51ec76305e88}</value>
+    </valuemap>
+    <value type="int" key="QtSupport.QtInformation">27</value>
+   </valuemap>
+   <value type="QString" key="PE.Profile.DeviceTypeForIcon"></value>
+   <value type="QString" key="PE.Profile.Icon"></value>
+   <value type="QString" key="PE.Profile.Id">{cec120c5-6455-497b-8059-8e079cbdd5fd}</value>
+   <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
+   <value type="QString" key="PE.Profile.Name">Desktop 6.2.4</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
+   <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
+  </valuemap>
+ </data>
+  <variable>Profile.Count</variable>
+  <value type="int">4</value>
+ </data>
+ <data>
+  <variable>Profile.Default</variable>
+  <value type="QString">{f9c7858c-d167-4b78-847a-91943bd0af07}</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">1</value>
+ </data>
+</qtcreator>
diff --git a/tests/system/settings/windows2022/QtProject/qtcreator/qtversion.xml b/tests/system/settings/windows2022/QtProject/qtcreator/qtversion.xml
new file mode 100644
index 00000000000..4b913250e65
--- /dev/null
+++ b/tests/system/settings/windows2022/QtProject/qtcreator/qtversion.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorQtVersions>
+<!-- Written by QtCreator 4.5.1, 2018-01-10T14:24:21. -->
+<qtcreator>
+ <data>
+  <variable>QtVersion.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">22</value>
+   <value type="QString" key="Name">Qt %{Qt:Version} (mingw1120_64)</value>
+   <value type="QString" key="QMakePath">SQUISH_QTOI_BASEPATH/6.7.3/mingw_64/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.1</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">24</value>
+   <value type="QString" key="Name">Qt %{Qt:Version} (msvc2017_64)</value>
+   <value type="QString" key="QMakePath">C:/Qt/Qt5.14.1/5.14.1/msvc2017_64/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.2</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">26</value>
+   <value type="QString" key="Name">Qt %{Qt:Version} (msvc2015)</value>
+   <value type="QString" key="QMakePath">C:/Qt/Qt5.10.1/5.10.1/msvc2015/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.3</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">27</value>
+   <value type="QString" key="Name">Qt %{Qt:Version} (msvc2019_64)</value>
+   <value type="QString" key="QMakePath">SQUISH_QTOI_BASEPATH/6.2.4/msvc2019_64/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">1</value>
+ </data>
+</qtcreator>
diff --git a/tests/system/settings/windows2022/QtProject/qtcreator/toolchains.xml b/tests/system/settings/windows2022/QtProject/qtcreator/toolchains.xml
new file mode 100644
index 00000000000..8d0a277a982
--- /dev/null
+++ b/tests/system/settings/windows2022/QtProject/qtcreator/toolchains.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorToolChains>
+<!-- Written by QtCreator 4.2.1, 2017-01-05T17:54:30. -->
+<qtcreator>
+ <data>
+  <variable>ToolChain.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/Qt/Tools/mingw1120_64/bin/g++.exe</value>
+   <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.PlatformCodeGenFlags"/>
+   <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.PlatformLinkerFlags"/>
+   <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
+    <value type="QString">x86-windows-msys-pe-64bit</value>
+   </valuelist>
+   <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">x86-windows-msys-pe-64bit</value>
+   <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MinGW 11.20</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb}</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ToolChain.1</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.GccToolChain.OriginalTargetTriple">i686-w64-mingw64</value>
+   <value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/Qt/Tools/mingw1120_64/bin/gcc.exe</value>
+   <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.PlatformCodeGenFlags"/>
+   <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.PlatformLinkerFlags"/>
+   <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
+    <value type="QString">x86-windows-msys-pe-64bit</value>
+   </valuelist>
+   <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">x86-windows-msys-pe-64bit</value>
+   <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MinGW 11.20</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Mingw:{777132b1-5d59-4adf-ab0d-3a6df2a0a0fb}</value>
+   <value type="int" key="ProjectExplorer.ToolChain.Language">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ToolChain.2</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2022-pe-64bit</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">amd64</value>
+   <valuelist type="QVariantList" key="ProjectExplorer.MsvcToolChain.environmentModifications">
+    <valuelist type="QVariantList">
+     <value type="QString">PATH</value>
+     <value type="int">0</value>
+     <value type="QString">SQUISH_MSVC2022_64_PATH</value>
+    </valuelist>
+   </valuelist>
+   <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MSVC2022 (amd64)</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{4580fc7c-8102-4144-a808-749b1a29f739}</value>
+   <value type="int" key="ProjectExplorer.ToolChain.Language">1</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.LanguageV2">C</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ToolChain.3</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2022-pe-64bit</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">amd64</value>
+   <valuelist type="QVariantList" key="ProjectExplorer.MsvcToolChain.environmentModifications">
+    <valuelist type="QVariantList">
+     <value type="QString">PATH</value>
+     <value type="int">0</value>
+     <value type="QString">SQUISH_MSVC2022_64_PATH</value>
+    </valuelist>
+   </valuelist>
+   <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MSVC2022 (amd64)</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{c6590889-1d34-4d12-af47-51ec76305e88}</value>
+   <value type="int" key="ProjectExplorer.ToolChain.Language">2</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.LanguageV2">Cxx</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ToolChain.4</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2022-pe-32bit</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">x86</value>
+   <valuelist type="QVariantList" key="ProjectExplorer.MsvcToolChain.environmentModifications">
+    <valuelist type="QVariantList">
+     <value type="QString">PATH</value>
+     <value type="int">0</value>
+     <value type="QString">SQUISH_MSVC2022_32_PATH</value>
+    </valuelist>
+   </valuelist>
+   <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MSVC2022 (x86)</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{c96cfaf3-fb8a-472b-b3c7-e94e8c490f17}</value>
+   <value type="int" key="ProjectExplorer.ToolChain.Language">1</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.LanguageV2">C</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ToolChain.5</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2022-pe-32bit</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">x86</value>
+   <valuelist type="QVariantList" key="ProjectExplorer.MsvcToolChain.environmentModifications">
+    <valuelist type="QVariantList">
+     <value type="QString">PATH</value>
+     <value type="int">0</value>
+     <value type="QString">SQUISH_MSVC2022_32_PATH</value>
+    </valuelist>
+   </valuelist>
+   <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MSVC2022 (x86)</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{ed856706-2a9d-4745-9d85-4e322b6f91d4}</value>
+   <value type="int" key="ProjectExplorer.ToolChain.Language">2</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.LanguageV2">Cxx</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ToolChain.Count</variable>
+  <value type="int">6</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">1</value>
+ </data>
+</qtcreator>
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index 4659dda5535..755234eacd5 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -7,16 +7,28 @@ import builtins
 class Targets:
     ALL_TARGETS = tuple(range(4))
 
-    (DESKTOP_5_4_1_GCC,
-     DESKTOP_5_10_1_DEFAULT,
-     DESKTOP_5_14_1_DEFAULT,
-     DESKTOP_6_2_4) = ALL_TARGETS
-
-    __TARGET_NAME_DICT__ = dict(zip(ALL_TARGETS,
-                                    ["Desktop 5.4.1 GCC",
-                                     "Desktop 5.10.1 default",
-                                     "Desktop 5.14.1 default",
-                                     "Desktop 6.2.4"]))
+    if os.getenv("SYSTEST_NEW_SETTINGS") != "1":
+        (DESKTOP_5_4_1_GCC,
+         DESKTOP_5_10_1_DEFAULT,
+         DESKTOP_5_14_1_DEFAULT,
+         DESKTOP_6_2_4) = ALL_TARGETS
+
+        __TARGET_NAME_DICT__ = dict(zip(ALL_TARGETS,
+                                        ["Desktop 5.4.1 GCC",
+                                         "Desktop 5.10.1 default",
+                                         "Desktop 5.14.1 default",
+                                         "Desktop 6.2.4"]))
+    else:
+        (DESKTOP_6_7_3_GCC,
+         DESKTOP_5_10_1_DEFAULT,
+         DESKTOP_5_14_1_DEFAULT,
+         DESKTOP_6_2_4) = ALL_TARGETS
+
+        __TARGET_NAME_DICT__ = dict(zip(ALL_TARGETS,
+                                        ["Desktop 6.7.3 GCC",
+                                         "Desktop 5.10.1 default",
+                                         "Desktop 5.14.1 default",
+                                         "Desktop 6.2.4"]))
 
     @staticmethod
     def isOnlineInstaller(target):
@@ -26,7 +38,10 @@ class Targets:
     def availableTargetClasses(ignoreValidity=False):
         availableTargets = set(Targets.ALL_TARGETS)
         if platform.system() not in ('Windows', 'Microsoft'):
-            availableTargets.remove(Targets.DESKTOP_5_4_1_GCC)
+            if os.getenv("SYSTEST_NEW_SETTINGS") == "1":
+                availableTargets.remove(Targets.DESKTOP_6_7_3_GCC)
+            else:
+                availableTargets.remove(Targets.DESKTOP_5_4_1_GCC)
         return availableTargets
 
     @staticmethod
@@ -85,7 +100,10 @@ class QtPath:
         qtTargets = [Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT,
                      Targets.DESKTOP_6_2_4]
         if platform.system() in ('Windows', 'Microsoft'):
-            qtTargets.append(Targets.DESKTOP_5_4_1_GCC)
+            if os.getenv("SYSTEST_NEW_SETTINGS") == "1":
+                qtTargets.append(Targets.DESKTOP_6_7_3_GCC)
+            else:
+                qtTargets.append(Targets.DESKTOP_5_4_1_GCC)
         if pathSpec == QtPath.DOCS:
             return map(lambda target: QtPath.docsPath(target), qtTargets)
         elif pathSpec == QtPath.EXAMPLES:
diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py
index 17f357881b2..e49e2e5df2d 100644
--- a/tests/system/shared/debugger.py
+++ b/tests/system/shared/debugger.py
@@ -179,7 +179,7 @@ def isMsvcConfig(currentKit):
     index = waitForObject(wantedKitIndexString)
     toolTip = str(index.data(Qt.ToolTipRole).toString())
     compilerPattern = re.compile('<dt style="font-weight:bold">Compiler:</dt><dd>(?P<compiler>.+)'
-                                 '</dd><dt style="font-weight:bold">Environment:')
+                                 '</dd><dt style="font-weight:bold">Debugger:')
     match = compilerPattern.search(toolTip)
     if match is None:
         test.warning("UI seems to have changed - failed to check for compiler.")
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index acf2bc1d7da..fa2567f2c05 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -534,7 +534,10 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False, ignoreVali
                                        Targets.DESKTOP_5_14_1_DEFAULT,
                                        Targets.DESKTOP_6_2_4]))
             if platform.system() in ('Windows', 'Microsoft'):
-                result.add(Targets.DESKTOP_5_4_1_GCC)
+                if os.getenv('SYSTEST_NEW_SETTINGS') == '1':
+                    result.add(Targets.DESKTOP_6_7_3_GCC)
+                else:
+                    result.add(Targets.DESKTOP_5_4_1_GCC)
     elif 'Platform independent' in text:
         result = Targets.desktopTargetClasses()
     else:
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 12d6fc364b8..80c41cb14e1 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -203,15 +203,16 @@ def substituteDefaultCompiler(settingsDir):
 
 
 def substituteMsvcPaths(settingsDir, version, targetBitness=64):
-    if not version in ['2017', '2019']:
+    if not version in ['2017', '2019', '2022']:
         test.fatal('Unexpected MSVC version - "%s" not implemented yet.' % version)
         return
 
     hostArch = "Hostx64" if targetBitness == 64 else "Hostx86"
     targetArch = "x64" if targetBitness == 64 else "x86"
+    baseFolder = "C:\\Program Files" if version == "2022" else "C:\\Program Files (x86)"
     for msvcFlavor in ["Community", "BuildTools"]:
         try:
-            msvcPath = os.path.join("C:\\Program Files (x86)", "Microsoft Visual Studio",
+            msvcPath = os.path.join(baseFolder, "Microsoft Visual Studio",
                                     version, msvcFlavor, "VC", "Tools", "MSVC")
             foundVersions = os.listdir(msvcPath) # undetermined order
             foundVersions.sort(reverse=True) # we explicitly want the latest and greatest
@@ -273,9 +274,13 @@ def copySettingsToTmpDir(destination=None, omitFiles=[]):
         substituteTildeWithinQtVersion(tmpSettingsDir)
         substituteDefaultCompiler(tmpSettingsDir)
     elif platform.system() in ('Windows', 'Microsoft'):
-        substituteMsvcPaths(tmpSettingsDir, '2017', 64)
-        substituteMsvcPaths(tmpSettingsDir, '2017', 32)
-        substituteMsvcPaths(tmpSettingsDir, '2019', 64)
+        if os.getenv('SYSTEST_NEW_SETTINGS') == '1':
+            substituteMsvcPaths(tmpSettingsDir, '2022', 32)
+            substituteMsvcPaths(tmpSettingsDir, '2022', 64)
+        else:
+            substituteMsvcPaths(tmpSettingsDir, '2017', 64)
+            substituteMsvcPaths(tmpSettingsDir, '2017', 32)
+            substituteMsvcPaths(tmpSettingsDir, '2019', 64)
         prependWindowsKit(tmpSettingsDir, 32)
     substituteOnlineInstallerPath(tmpSettingsDir)
     SettingsPath = ['-settingspath', '"%s"' % tmpSettingsDir]
@@ -285,7 +290,10 @@ test.log("Test is running on Python %s" % sys.version)
 origSettingsDir = os.path.abspath(os.path.join(os.getcwd(), "..", "..", "settings"))
 
 if platform.system() in ('Windows', 'Microsoft'):
-    origSettingsDir = os.path.join(origSettingsDir, "windows")
+    if os.getenv("SYSTEST_NEW_SETTINGS") == "1":
+        origSettingsDir = os.path.join(origSettingsDir, "windows2022")
+    else:
+        origSettingsDir = os.path.join(origSettingsDir, "windows")
 elif platform.system() == 'Darwin':
     origSettingsDir = os.path.join(origSettingsDir, "mac")
 else:
diff --git a/tests/system/suite_APTW/tst_APTW01/test.py b/tests/system/suite_APTW/tst_APTW01/test.py
index f1536b2a874..110d6bba43e 100644
--- a/tests/system/suite_APTW/tst_APTW01/test.py
+++ b/tests/system/suite_APTW/tst_APTW01/test.py
@@ -13,7 +13,9 @@ def main():
     # run project for debug and release and verify results
     expectToFail = None
     if platform.system() in ('Microsoft', 'Windows'):
-        expectToFail = [Targets.DESKTOP_5_4_1_GCC]
+        expectToFail = [Targets.DESKTOP_5_10_1_DEFAULT] # fails to handle constexpr correctly
+        if os.getenv('SYSTEST_NEW_SETTINGS') != '1':
+            expectToFail.append(Targets.DESKTOP_5_4_1_GCC)
     runVerify(expectToFail)
     #close Qt Creator
     invokeMenuItem("File", "Exit")
diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py
index 1168ca94a50..65913db05e4 100644
--- a/tests/system/suite_CCOM/tst_CCOM01/test.py
+++ b/tests/system/suite_CCOM/tst_CCOM01/test.py
@@ -17,9 +17,12 @@ def main():
     startQC()
     if not startedWithoutPluginError():
         return
-    # open example project, supports only Qt 5
+    # open example project
     targets = Targets.desktopTargetClasses()
-    targets.discard(Targets.DESKTOP_5_4_1_GCC)
+    if os.getenv('SYSTEST_NEW_SETTINGS') != '1':
+        targets.discard(Targets.DESKTOP_5_4_1_GCC)
+    targets.discard(Targets.DESKTOP_5_10_1_DEFAULT) # fails to handle constexpr correctly
+
     openQmakeProject(examplePath, targets)
     # build and wait until finished - on all build configurations
     availableConfigs = iterateBuildConfigs()
diff --git a/tests/system/suite_debugger/tst_build_new_project/test.py b/tests/system/suite_debugger/tst_build_new_project/test.py
index b29678ffcf6..c4b521fec1f 100644
--- a/tests/system/suite_debugger/tst_build_new_project/test.py
+++ b/tests/system/suite_debugger/tst_build_new_project/test.py
@@ -17,7 +17,8 @@ def main():
     expectConfigureToFail = []
     expectBuildToFail = []
     if platform.system() in ('Microsoft', 'Windows'):
-        expectConfigureToFail = [ Targets.DESKTOP_5_4_1_GCC ] # gcc 4.9 does not know C++17
+        if os.getenv('SYSTEST_NEW_SETTINGS') != '1':
+            expectConfigureToFail = [ Targets.DESKTOP_5_4_1_GCC ] # gcc 4.9 does not know C++17
         expectBuildToFail = [ Targets.DESKTOP_5_10_1_DEFAULT ] # fails to handle constexpr correctly
 
     for kit, config in availableConfigs:
diff --git a/tests/system/suite_debugger/tst_cli_output_console/test.py b/tests/system/suite_debugger/tst_cli_output_console/test.py
index aed9089fed9..1d6d7259926 100644
--- a/tests/system/suite_debugger/tst_cli_output_console/test.py
+++ b/tests/system/suite_debugger/tst_cli_output_console/test.py
@@ -16,6 +16,8 @@ def main():
     if platform.system() in ('Microsoft', 'Windows'):
         # Qt5.10 has constructs that do not work on Win because of limitation to older C++
         targets = [Targets.DESKTOP_5_14_1_DEFAULT, Targets.DESKTOP_6_2_4]
+        if os.getenv('SYSTEST_NEW_SETTINGS') == '1':
+            targets.append(Targets.DESKTOP_6_7_3_GCC)
     createProject_Qt_Console(tempDir(), project, targets=targets)
 
     mainEditor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
@@ -56,13 +58,7 @@ def main():
             appOutput = str(waitForObject(":Qt Creator_Core::OutputWindow").plainText)
             verifyOutput(appOutput, outputStdOut, "std::cout", "Application Output")
             verifyOutput(appOutput, outputStdErr, "std::cerr", "Application Output")
-            if (kit == Targets.DESKTOP_5_4_1_GCC
-                and platform.system() in ('Windows', 'Microsoft')):
-                test.log("Skipping qDebug() from %s (unstable, QTCREATORBUG-15067)"
-                         % Targets.getStringForTarget(Targets.DESKTOP_5_4_1_GCC))
-            else:
-                verifyOutput(appOutput, outputQDebug,
-                             "qDebug()", "Application Output")
+            verifyOutput(appOutput, outputQDebug, "qDebug()", "Application Output")
             clickButton(waitForObject(":Qt Creator_CloseButton"))
         except:
             test.fatal("Could not find Application Output Window",