From a35ebe27538818766d5123f9f16c09c677c3e25f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20L=C3=B6hning?= <robert.loehning@qt.io>
Date: Thu, 15 Sep 2022 19:41:53 +0200
Subject: [PATCH] Squish: Update and improve isMsvcConfig()

Change-Id: Icff3a8178e89623097e2da7ff8f1e72197f1a4dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 tests/system/shared/debugger.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py
index 586867fd5c8..6714dd52f7a 100644
--- a/tests/system/shared/debugger.py
+++ b/tests/system/shared/debugger.py
@@ -174,6 +174,8 @@ def doSimpleDebugging(currentKit, currentConfigName, expectedBPOrder=[], enableQ
 
 # param currentKit specifies the ID of the kit to use (see class Targets)
 def isMsvcConfig(currentKit):
+    if platform.system() not in ('Microsoft' 'Windows'):
+        return False
     switchViewTo(ViewConstants.PROJECTS)
     switchToBuildOrRunSettingsFor(currentKit, ProjectSettings.BUILD)
 
@@ -186,7 +188,8 @@ def isMsvcConfig(currentKit):
         raise Exception("Kit '%s' is not activated in the project." % wantedKitName)
     index = waitForObject(wantedKitIndexString)
     toolTip = str(index.data(Qt.ToolTipRole).toString())
-    compilerPattern = re.compile("<tr><td><b>Compiler:</b></td><td>(?P<compiler>.+)</td></tr>")
+    compilerPattern = re.compile('<dt style="font-weight:bold">Compiler:</dt><dd>(?P<compiler>.+)'
+                                 '</dd><dt style="font-weight:bold">Environment:')
     match = compilerPattern.search(toolTip)
     if match is None:
         test.warning("UI seems to have changed - failed to check for compiler.")