diff options
| -rw-r--r-- | tests/system/shared/hook_utils.py | 3 | ||||
| -rw-r--r-- | tests/system/shared/project.py | 2 | ||||
| -rw-r--r-- | tests/system/suite_qtquick/tst_qtquick_creation3/test.py | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/tests/system/shared/hook_utils.py b/tests/system/shared/hook_utils.py index 96509e23ce..aad61157c6 100644 --- a/tests/system/shared/hook_utils.py +++ b/tests/system/shared/hook_utils.py @@ -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) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index a4ec2ac349..f2980d9b27 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -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) diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py index fc6345ca88..b3a7e8b7ea 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py @@ -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) |