aboutsummaryrefslogtreecommitdiffstats
path: root/tests/system
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2019-06-14 13:52:34 +0200
committerRobert Loehning <robert.loehning@qt.io>2019-06-18 11:32:21 +0000
commita5821ae06da62659779b63d3f478c1d2225fa238 (patch)
treea9215cf9ad120983738cda233a3fd078223b3320 /tests/system
parenta2cfa434683552f63699a70e9de2295a12f41eaa (diff)
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 <christian.stenger@qt.io>
Diffstat (limited to 'tests/system')
-rw-r--r--tests/system/suite_general/tst_default_settings/test.py13
1 files 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 a24307dd4a..928f890b2a 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):