feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	src/plugins/remotelinux/linuxdevice.cpp

Change-Id: Iad28a1bfa4632922931d351d2fe27757cf21dec3
This commit is contained in:
Eike Ziller
2024-04-15 08:33:39 +02:00
parent 559c57e29c 25d6c4f4e9
commit 310d3cc041
27 changed files with 113 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/system/shared/utils.py
View File

@@ -71,15 +71,15 @@ def verifyEnabled(objectSpec, expectedState = True):
# param itemName is the item to be selected in the combo box
# returns True if selection was changed or False if the wanted value was already selected
def selectFromCombo(objectSpec, itemName):
object = verifyEnabled(objectSpec)
if itemName == str(object.currentText):
comboObject = verifyEnabled(objectSpec)
if itemName == str(comboObject.currentText):
return False
else:
mouseClick(object)
mouseClick(comboObject)
snooze(1)
# params required here
mouseClick(waitForObjectItem(object, itemName.replace(".", "\\.")), 5, 5, 0, Qt.LeftButton)
test.verify(waitFor("str(object.currentText)==itemName", 5000),
mouseClick(waitForObjectItem(comboObject, itemName.replace(".", "\\.")))
test.verify(waitFor("str(comboObject.currentText)==itemName", 5000),
"Switched combo item to '%s'" % itemName)
return True
@@ -588,15 +588,12 @@ def getHelpTitle():
def isString(sth):
if sys.version_info.major > 2:
return isinstance(sth, str)
else:
return isinstance(sth, (str, unicode))
return isinstance(sth, str)
# helper function to ensure we get str, converts bytes if necessary
def stringify(obj):
stringTypes = (str, unicode) if sys.version_info.major == 2 else (str)
if isinstance(obj, stringTypes):
if isString(obj):
return obj
if isinstance(obj, bytes):
if not platform.system() in ('Microsoft', 'Windows'):