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

Squish: Fix usage of Qt Quick UI wizard

Browse Source 
Change-Id: I51aee75d695ab8faa8090dc44fd4abb79b0181b6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2012-11-28 11:34:15 +01:00
parent 04e8abfa4c
commit 8a6d5ccd36
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/hook_utils.py
+1 -2
View File
@@ -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)
tests/system/shared/project.py
+1 -1
View File
@@ -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)
tests/system/suite_qtquick/tst_qtquick_creation3/test.py
+1 -2
View File
@@ -1,13 +1,12 @@
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)