Merge remote-tracking branch 'origin/4.9' into 4.10

Change-Id: Id3bd5794a6821855c41567e8de3898d94a896ceb
This commit is contained in:
Eike Ziller
2019-06-21 10:50:26 +02:00

View File

@@ -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):