diff options
| author | Robert Löhning <robert.loehning@qt.io> | 2023-05-05 16:45:08 +0200 |
|---|---|---|
| committer | Robert Löhning <robert.loehning@qt.io> | 2023-05-15 14:13:41 +0000 |
| commit | e719a2b47a11cdb6c4c9ac8fe889cf8347380580 (patch) | |
| tree | 0001ef0fac4e320a2a2c26ff77cdfef4f35566f4 | |
| parent | 0b241f42f186e13b70550c070d3d271c1eb9e989 (diff) | |
SquishTests: Update tst_create_proj_wizard
Change-Id: Id17f5d1a68da7fe7c9f45dc5b62ab3fe1039f753
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| -rw-r--r-- | tests/system/shared/project.py | 6 | ||||
| -rw-r--r-- | tests/system/suite_general/tst_create_proj_wizard/test.py | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index d05a3b37a8..2e541ddf92 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -125,8 +125,8 @@ def __handleBuildSystem__(buildSystem): return buildSystem def __createProjectHandleQtQuickSelection__(minimumQtVersion): - comboBox = waitForObject("{name='MinimumSupportedQtVersion' type='QComboBox' " - "visible='1' window=':New_ProjectExplorer::JsonWizard'}") + comboBox = waitForObject("{name?='*QtVersion' type='QComboBox' visible='1'" + " window=':New_ProjectExplorer::JsonWizard'}") try: selectFromCombo(comboBox, minimumQtVersion) except: @@ -505,7 +505,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False, ignoreVali version = res.group("version") else: version = None - if "Qt Quick" in templateName: + if templateName == "Qt Quick Application": result = set([Targets.DESKTOP_6_2_4]) elif 'Supported Platforms' in text: supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split("\n") 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 5cf9365275..643e8054fa 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -53,11 +53,18 @@ def main(): template = list(current.values())[0] with TestSection("Testing project template %s -> %s" % (category, template)): displayedPlatforms = __createProject__(category, template) - if template == "Qt Quick Application": - qtVersionsForQuick = ["6.2"] + if template.startswith("Qt Quick Application"): + if "(compat)" in template: # QTCREATORBUG-29126 + qtVersionsForQuick = ["Qt 5.14", "Qt 6.2"] + else: + qtVersionsForQuick = ["6.2"] for counter, qtVersion in enumerate(qtVersionsForQuick): def additionalFunc(displayedPlatforms, qtVersion): requiredQtVersion = __createProjectHandleQtQuickSelection__(qtVersion) + if sys.version_info.major > 2: + requiredQtVersion = requiredQtVersion.removeprefix("Qt ") + else: + requiredQtVersion = requiredQtVersion.lstrip("Qt ") __modifyAvailableTargets__(displayedPlatforms, requiredQtVersion, True) handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms, additionalFunc, qtVersion) @@ -120,7 +127,7 @@ def handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms, clickButton(waitForObject(":Next_QPushButton")) if specialHandlingFunc: specialHandlingFunc(displayedPlatforms, *args) - if not ('Plain C' in template or 'Qt Quick' in template): + if not ('Plain C' in template or template == 'Qt Quick Application'): __createProjectHandleTranslationSelection__() verifyKitCheckboxes(kits, displayedPlatforms) safeClickButton("Cancel") |