Squish: Fix usage of Qt Quick UI wizard

Change-Id: I51aee75d695ab8faa8090dc44fd4abb79b0181b6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

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)
 

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)

tests/system/suite_qtquick/tst_qtquick_creation3/test.py

 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)