From a5821ae06da62659779b63d3f478c1d2225fa238 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 14 Jun 2019 13:52:34 +0200 Subject: [PATCH] Squish: Fix crash in tst_default_settings On Windows, compilers of type "Clang" display a QComboBox instead of a QLabel Change-Id: I68537259d8d5b38b288308675139c92395f6df62 Reviewed-by: Christian Stenger --- .../suite_general/tst_default_settings/test.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index a24307dd4a8..928f890b2ab 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -121,10 +121,15 @@ def __compFunc__(it, foundComp, foundCompNames): pathLineEdit = findObject(":Path.Utils_BaseValidatingLineEdit") foundComp.append(str(pathLineEdit.text)) except: - label = findObject("{buddy={container=':qt_tabwidget_stackedwidget_QWidget' " - "text='Initialization:' type='QLabel' unnamed='1' visible='1'} " - "type='QLabel' unnamed='1' visible='1'}") - foundComp.append({it:str(label.text)}) + objectString = ("{buddy={container=':qt_tabwidget_stackedwidget_QWidget'" + " text='Initialization:' type='QLabel' unnamed='1' visible='1'}" + " type='%s' unnamed='1' visible='1'}") + try: + foundText = findObject(objectString % "QLabel").text + except: + foundText = findObject(objectString % "QComboBox").currentText + foundComp.append({it:str(foundText)}) + foundCompNames.append(it) def __dbgFunc__(it, foundDbg):