diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-21 10:50:26 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-21 10:50:26 +0200 |
| commit | 3acbd6032fe6809fcd373a48a2ee83d968136dea (patch) | |
| tree | 160974615ade93458b617e36012380cbb9a28568 /tests/system | |
| parent | 7b6ebea648bae91ee4ba014237eae34eb34d3805 (diff) | |
| parent | a5821ae06da62659779b63d3f478c1d2225fa238 (diff) | |
Merge remote-tracking branch 'origin/4.9' into 4.10
Change-Id: Id3bd5794a6821855c41567e8de3898d94a896ceb
Diffstat (limited to 'tests/system')
| -rw-r--r-- | tests/system/suite_general/tst_default_settings/test.py | 13 |
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): |