Commit 8a6d5ccd authored by Christian Stenger's avatar Christian Stenger

Squish: Fix usage of Qt Quick UI wizard

Change-Id: I51aee75d695ab8faa8090dc44fd4abb79b0181b6
Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
parent 04e8abfa
......@@ -54,8 +54,7 @@ def modifyRunSettingsForHookInto(projectName, port):
switchViewTo(ViewConstants.EDIT)
return result
def modifyRunSettingsForHookIntoQtQuickUI(projectName, port):
global workingDir
def modifyRunSettingsForHookIntoQtQuickUI(workingDir, projectName, port):
switchViewTo(ViewConstants.PROJECTS)
switchToBuildOrRunSettingsFor(1, 0, ProjectSettings.RUN, True)
......
......@@ -223,7 +223,7 @@ def createNewQtQuickApplication(workingDir, projectName = None, templateFile = N
return projectName
def createNewQtQuickUI(workingDir):
__createProjectOrFileSelectType__(" Applications", "Qt Quick UI")
__createProjectOrFileSelectType__(" Applications", "Qt Quick 1 UI")
if workingDir == None:
workingDir = tempDir()
projectName = __createProjectSetNameAndPath__(workingDir)
......
source("../../shared/qtcreator.py")
def main():
global workingDir
startApplication("qtcreator" + SettingsPath)
# using a temporary directory won't mess up a potentially existing
workingDir = tempDir()
projectName = createNewQtQuickUI(workingDir)
test.log("Running project")
qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(projectName, 11223)
qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(workingDir, projectName, 11223)
if qmlViewer!=None:
qmlViewerPath = os.path.dirname(qmlViewer)
qmlViewer = os.path.basename(qmlViewer)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment