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

Squish: Update createNewQtQuickUI() and calling code

Browse Source 
Change-Id: I117afaabd0baf6074247c55b66d8d302b9dbfd34
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2017-09-07 18:10:57 +02:00
parent acf908fc18
commit 1e3b5418ea
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,7 +309,7 @@ def createNewQtQuickApplication(workingDir, projectName = None,
return checkedTargets, projectName return checkedTargets, projectName
def createNewQtQuickUI(workingDir, qtVersion = "5.3"): def createNewQtQuickUI(workingDir, qtVersion = "5.6"):
__createProjectOrFileSelectType__(" Other Project", 'Qt Quick UI Prototype') __createProjectOrFileSelectType__(" Other Project", 'Qt Quick UI Prototype')
if workingDir == None: if workingDir == None:
workingDir = tempDir() workingDir = tempDir()

24
tests/system/suite_qtquick/tst_qtquick_creation3/test.py
View File

@@ -30,29 +30,17 @@ def main():
if not startedWithoutPluginError(): if not startedWithoutPluginError():
return return
available = ["5.6"] available = ["5.6"]
if platform.system() != 'Darwin':
available.extend(["5.4"])
for qtVersion in available: for qtVersion in available:
# 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()
projectName = createNewQtQuickUI(workingDir, qtVersion) projectName = createNewQtQuickUI(workingDir, qtVersion)
if qtVersion == "5.6": kit = Targets.getStringForTarget(Targets.DESKTOP_561_DEFAULT)
kit = Targets.getStringForTarget(Targets.DESKTOP_561_DEFAULT) if addAndActivateKit(Targets.DESKTOP_561_DEFAULT):
if addAndActivateKit(Targets.DESKTOP_561_DEFAULT): quick = "2.6"
quick = "2.6" else:
else: test.fatal("Failed to activate kit %s" % kit)
test.fatal("Failed to activate kit %s" % kit) continue
continue
else: # qtVersion == '5.4'
if platform.system() == 'Darwin':
continue
kit = Targets.getStringForTarget(Targets.DESKTOP_541_GCC)
if addAndActivateKit(Targets.DESKTOP_541_GCC):
quick = "2.4"
else:
test.fatal("Failed to activate kit %s" % kit)
continue
test.log("Running project Qt Quick UI Prototype (%s)" % kit) test.log("Running project Qt Quick UI Prototype (%s)" % kit)
qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(2, 1, workingDir, projectName, 11223, quick) qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(2, 1, workingDir, projectName, 11223, quick)
if qmlViewer!=None: if qmlViewer!=None: