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

Merge remote-tracking branch 'origin/6.0' into 7.0

Browse Source 
Change-Id: I61bc71d3a4e786b5392aed408f0efe4d28fe7e67
This commit is contained in:
Eike Ziller
2022-02-11 10:49:15 +01:00
parent ce27886eeb 5d675ff533
commit b98de260e3
35 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/project.py
+6 -2
View File
@@ -69,7 +69,10 @@ def openCmakeProject(projectPath, buildDir):
invokeMenuItem("File", "Open File or Project...")
selectFromFileDialog(projectPath)
__chooseTargets__([]) # uncheck all
__chooseTargets__([Targets.DESKTOP_4_8_7_DEFAULT], additionalFunc=additionalFunction)
targetToChoose = Targets.DESKTOP_4_8_7_DEFAULT # FIXME make the intended target a parameter
if not qt4Available:
targetToChoose = Targets.DESKTOP_5_14_1_DEFAULT
__chooseTargets__([targetToChoose], additionalFunc=additionalFunction)
clickButton(waitForObject(":Qt Creator.Configure Project_QPushButton"))
return True
@@ -524,7 +527,8 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
result = set()
if 'Desktop' in supports:
if (version == None or version < "5.0") and not templateName.startswith("Qt Quick 2"):
result.add(Targets.DESKTOP_4_8_7_DEFAULT)
if qt4Available:
result.add(Targets.DESKTOP_4_8_7_DEFAULT)
if platform.system() in ("Linux", "Darwin"):
result.add(Targets.EMBEDDED_LINUX)
result = result.union(set([Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT]))