Commit 2427f126 authored by Robert Loehning's avatar Robert Loehning

Squish: Update combos for creating projects

Change-Id: Ibbabacc7a5e357ac765ef8629e74ca2e05505078
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 00328f96
......@@ -125,7 +125,7 @@ def __createProjectSetNameAndPath__(path, projectName = None, checks = True, lib
return str(projectName)
def __handleBuildSystem__(buildSystem):
combo = "{name='BuildSystem' type='Utils::TextFieldComboBox' visible='1'}"
combo = "{name='BuildSystem' type='QComboBox' visible='1'}"
try:
comboObj = waitForObject(combo, 2000)
except:
......@@ -144,7 +144,7 @@ def __handleBuildSystem__(buildSystem):
def __createProjectHandleQtQuickSelection__(minimumQtVersion):
comboBox = waitForObject("{leftWidget=':Minimal required Qt version:_QLabel' name='QtVersion' "
"type='Utils::TextFieldComboBox' visible='1'}")
"type='QComboBox' visible='1'}")
try:
selectFromCombo(comboBox, "Qt %s" % minimumQtVersion)
except:
......@@ -369,7 +369,7 @@ def createNewNonQtProject(workingDir=None, projectName=None, target=[Targets.DES
"be False, ignoring the value of cmake")
elif cmake:
buildSystem = "CMake"
selectFromCombo("{name='BuildSystem' type='Utils::TextFieldComboBox' visible='1'}", buildSystem)
selectFromCombo("{name='BuildSystem' type='QComboBox' visible='1'}", buildSystem)
clickButton(waitForObject(":Next_QPushButton"))
__chooseTargets__(target, availableTargets=available)
......
......@@ -113,7 +113,7 @@ def verifyKitCheckboxes(kits, displayedPlatforms):
def handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms,
specialHandlingFunc = None, *args):
global availableBuildSystems
combo = "{name='BuildSystem' type='Utils::TextFieldComboBox' visible='1'}"
combo = "{name='BuildSystem' type='QComboBox' visible='1'}"
try:
waitForObject(combo, 2000)
skipBuildsystemChooser = False
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment