diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2017-12-01 18:34:14 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2017-12-06 13:21:15 +0000 |
| commit | 2427f1267f8dc65f2cd442b52fb5554f2cb83a0e (patch) | |
| tree | fc7f86d2def155c4d657449697829dce5b4c0c69 | |
| parent | 00328f96a4c415a55c4dbe80f8270c513ec86aed (diff) | |
| download | qt-creator-2427f1267f8dc65f2cd442b52fb5554f2cb83a0e.tar.gz | |
Squish: Update combos for creating projects
Change-Id: Ibbabacc7a5e357ac765ef8629e74ca2e05505078
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | tests/system/shared/project.py | 6 | ||||
| -rw-r--r-- | tests/system/suite_general/tst_create_proj_wizard/test.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 80bada05c9..06b67e18c7 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -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) diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py index 4621bcd517..3882093ad2 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -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 |