Squish: Make some variables local

Change-Id: I1687ae59c6327616ee18f6120dca9d0d0ce40bcf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

tests/system/shared/build_utils.py

@@ -35,10 +35,6 @@ installedSignalHandlers = {}
 overridenInstallLazySignalHandlers = False
 # flag to indicate whether a tasks file should be created when building ends with errors
 createTasksFileOnError = True
-# currently used directory for tasks files
-tasksFileDir = None
-# counter for written tasks files
-tasksFileCount = 0
 
 # call this function to override installLazySignalHandler()
 def overrideInstallLazySignalHandler():
@@ -117,9 +113,14 @@ def dumpBuildIssues(listModel):
                               range(Qt.UserRole, Qt.UserRole + 6))])
     return issueDump
 
+# counter for written tasks files
+tasksFileCount = 0
+
 # helper method that writes a tasks file
 def createTasksFile(buildIssues):
-    global tasksFileDir, tasksFileCount
+    # currently used directory for tasks files
+    tasksFileDir = None
+    global tasksFileCount
     if tasksFileDir == None:
             tasksFileDir = os.getcwd() + "/tasks"
             tasksFileDir = os.path.abspath(tasksFileDir)

tests/system/suite_editors/tst_qml_editor/test.py

@@ -29,11 +29,9 @@
 
 source("../../shared/qtcreator.py")
 
-templateDir = None
 searchFinished = False
 
 def main():
-    global templateDir
     sourceExample = os.path.abspath(sdkPath + "/Examples/4.7/declarative/keyinteraction/focus")
     proFile = "focus.pro"
     if not neededFilePresent(os.path.join(sourceExample, proFile)):

tests/system/suite_editors/tst_revert_changes/test.py

@@ -43,7 +43,6 @@ def init():
         endShortCut = "<Ctrl+End>"
 
 def main():
-    global cppEditorStr
     folder = prepareTemplate(originalSources)
     if folder == None:
         test.fatal("Could not prepare test files - leaving test")

tests/system/suite_qtquick/tst_qml_outline/test.py

@@ -75,7 +75,7 @@ def processChildren(model, startIndex, level):
     return children
 
 def testModify():
-    global qmlEditor, outline
+    global qmlEditor
     if not openDocument("focus.QML.qml.focus\\.qml"):
         test.fatal("Failed to open file focus.qml")
         return