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

Squish: Update createNewQtQuickApplication() and calling code

Browse Source 
This is only meant to let the wizard finish successfully. Further
changes will be needed because of changed code in the project.

Change-Id: Ic88ffa107f15c55b3278d3d6fc4d3c2dbc4d728b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2017-09-07 15:21:34 +02:00
parent b7cdd90e55
commit 89d08bf4b2
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,12 +281,12 @@ def createProject_Qt_Console(path, projectName, checks = True, buildSystem = Non
return checkedTargets return checkedTargets
def createNewQtQuickApplication(workingDir, projectName = None, def createNewQtQuickApplication(workingDir, projectName = None,
targets=Targets.desktopTargetClasses(), minimumQtVersion="5.3", targets=Targets.desktopTargetClasses(), minimumQtVersion="5.6",
withControls = False, fromWelcome = False, buildSystem = None): withControls = False, fromWelcome = False, buildSystem = None):
if withControls: if withControls:
template = "Qt Quick Controls 2 Application" template = "Qt Quick Application - Swipe"
else: else:
template = "Qt Quick Application" template = "Qt Quick Application - Empty"
available = __createProjectOrFileSelectType__(" Application", template, fromWelcome) available = __createProjectOrFileSelectType__(" Application", template, fromWelcome)
projectName = __createProjectSetNameAndPath__(workingDir, projectName) projectName = __createProjectSetNameAndPath__(workingDir, projectName)
__handleBuildSystem__(buildSystem) __handleBuildSystem__(buildSystem)

12
tests/system/suite_qtquick/tst_qtquick_creation/test.py
View File

@@ -30,17 +30,11 @@ def main():
if not startedWithoutPluginError(): if not startedWithoutPluginError():
return return
available = [("5.3", False), ("5.3", True)] available = [("5.6", False), ("5.6", True)]
if platform.system() != 'Darwin':
available.extend([("5.4", False), ("5.4", True)])
for qtVersion, controls in available: for qtVersion, controls in available:
if qtVersion == "5.3": targ = [Targets.DESKTOP_561_DEFAULT]
targ = [Targets.DESKTOP_531_DEFAULT] quick = "2.6"
quick = "2.3"
else:
targ = [Targets.DESKTOP_541_GCC]
quick = "2.4"
# using a temporary directory won't mess up a potentially existing # using a temporary directory won't mess up a potentially existing
workingDir = tempDir() workingDir = tempDir()
checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targ, checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targ,