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

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): ...@@ -54,8 +54,7 @@ def modifyRunSettingsForHookInto(projectName, port):
switchViewTo(ViewConstants.EDIT) switchViewTo(ViewConstants.EDIT)
return result return result
def modifyRunSettingsForHookIntoQtQuickUI(projectName, port): def modifyRunSettingsForHookIntoQtQuickUI(workingDir, projectName, port):
global workingDir
switchViewTo(ViewConstants.PROJECTS) switchViewTo(ViewConstants.PROJECTS)
switchToBuildOrRunSettingsFor(1, 0, ProjectSettings.RUN, True) switchToBuildOrRunSettingsFor(1, 0, ProjectSettings.RUN, True)
......
...@@ -223,7 +223,7 @@ def createNewQtQuickApplication(workingDir, projectName = None, templateFile = N ...@@ -223,7 +223,7 @@ def createNewQtQuickApplication(workingDir, projectName = None, templateFile = N
return projectName return projectName
def createNewQtQuickUI(workingDir): def createNewQtQuickUI(workingDir):
__createProjectOrFileSelectType__(" Applications", "Qt Quick UI") __createProjectOrFileSelectType__(" Applications", "Qt Quick 1 UI")
if workingDir == None: if workingDir == None:
workingDir = tempDir() workingDir = tempDir()
projectName = __createProjectSetNameAndPath__(workingDir) projectName = __createProjectSetNameAndPath__(workingDir)
......
source("../../shared/qtcreator.py") source("../../shared/qtcreator.py")
def main(): def main():
global workingDir
startApplication("qtcreator" + SettingsPath) startApplication("qtcreator" + SettingsPath)
# 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) projectName = createNewQtQuickUI(workingDir)
test.log("Running project") test.log("Running project")
qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(projectName, 11223) qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(workingDir, projectName, 11223)
if qmlViewer!=None: if qmlViewer!=None:
qmlViewerPath = os.path.dirname(qmlViewer) qmlViewerPath = os.path.dirname(qmlViewer)
qmlViewer = os.path.basename(qmlViewer) qmlViewer = os.path.basename(qmlViewer)
......
Supports Markdown
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