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

Squish: Re-enable testing Qt Quick 2 Extension Plugin wizard

Browse Source 
This effectively reverts commit 4f2f86b5bf.
Additionally fixes the expected kits for this template.

Change-Id: Ie90f113894d331fa4023b8c58f30da5c4886c76d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2019-11-15 09:04:13 +01:00
committed by Robert Loehning
parent a08a5499e9
commit ebcde98b72
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/shared/project.py
View File

@@ -513,7 +513,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ") supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ")
result = set() result = set()
if 'Desktop' in supports: 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) result.add(Targets.DESKTOP_4_8_7_DEFAULT)
if platform.system() in ("Linux", "Darwin"): if platform.system() in ("Linux", "Darwin"):
result.add(Targets.EMBEDDED_LINUX) result.add(Targets.EMBEDDED_LINUX)

5
tests/system/suite_general/tst_create_proj_wizard/test.py
View File

@@ -62,8 +62,7 @@ def main():
template = template.replace(".", "\\.") template = template.replace(".", "\\.")
# skip non-configurable # skip non-configurable
if template not in ["Qt Quick UI Prototype", "Auto Test Project", # FIXME if template not in ["Qt Quick UI Prototype", "Auto Test Project", # FIXME
"Qt for Python - Empty", "Qt for Python - Window", "Qt for Python - Empty", "Qt for Python - Window"]:
"Qt Quick 2 Extension Plugin"]:
availableProjectTypes.append({category:template}) availableProjectTypes.append({category:template})
safeClickButton("Cancel") safeClickButton("Cancel")
for current in availableProjectTypes: for current in availableProjectTypes:
@@ -82,7 +81,7 @@ def main():
# are there more Quick combinations - then recreate this project # are there more Quick combinations - then recreate this project
if counter < len(qtVersionsForQuick) - 1: if counter < len(qtVersionsForQuick) - 1:
displayedPlatforms = __createProject__(category, template) 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(_): def skipDetails(_):
clickButton(waitForObject(":Next_QPushButton")) clickButton(waitForObject(":Next_QPushButton"))
handleBuildSystemVerifyKits(category, template, kits, handleBuildSystemVerifyKits(category, template, kits,