From ebcde98b722c9a29e5a26a9a4a585a872ca91948 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 15 Nov 2019 09:04:13 +0100 Subject: [PATCH] Squish: Re-enable testing Qt Quick 2 Extension Plugin wizard This effectively reverts commit 4f2f86b5bfd45e0bc9fc690d0ec7b7880eac7f36. Additionally fixes the expected kits for this template. Change-Id: Ie90f113894d331fa4023b8c58f30da5c4886c76d Reviewed-by: Robert Loehning --- tests/system/shared/project.py | 2 +- tests/system/suite_general/tst_create_proj_wizard/test.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 471abd8a1ed..7ea25299e52 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -513,7 +513,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ") result = set() if 'Desktop' in supports: - if (version == None or version < "5.0"): + if (version == None or version < "5.0") and not templateName.startswith("Qt Quick 2"): result.add(Targets.DESKTOP_4_8_7_DEFAULT) if platform.system() in ("Linux", "Darwin"): result.add(Targets.EMBEDDED_LINUX) 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 69d1c4de4d7..3fdce9645be 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -62,8 +62,7 @@ def main(): template = template.replace(".", "\\.") # skip non-configurable if template not in ["Qt Quick UI Prototype", "Auto Test Project", # FIXME - "Qt for Python - Empty", "Qt for Python - Window", - "Qt Quick 2 Extension Plugin"]: + "Qt for Python - Empty", "Qt for Python - Window"]: availableProjectTypes.append({category:template}) safeClickButton("Cancel") for current in availableProjectTypes: @@ -82,7 +81,7 @@ def main(): # are there more Quick combinations - then recreate this project if counter < len(qtVersionsForQuick) - 1: displayedPlatforms = __createProject__(category, template) - elif template in ("Qt Widgets Application", "C++ Library"): + elif template in ("Qt Widgets Application", "Qt Quick 2 Extension Plugin", "C++ Library"): def skipDetails(_): clickButton(waitForObject(":Next_QPushButton")) handleBuildSystemVerifyKits(category, template, kits,