Merge remote-tracking branch 'origin/10.0' into qds/dev

Change-Id: Ifb5f580cfea7c0d166756938b013a338279d45d9

tests/auto/qml/persistenttrie/persistenttrie.qbs

@@ -5,7 +5,6 @@ QtcAutotest {
     Depends { name: "QmlJS" }
     files: [ "tst_testtrie.h", "tst_testtrie.cpp" ]
     cpp.defines: base.concat([
-        'QMLJS_LIBRARY',
         'QTCREATORDIR="' + project.ide_source_tree + '"',
         'TESTSRCDIR="' + path + '"'
     ])

tests/system/shared/project.py

@@ -544,6 +544,7 @@ def checkAndCopyFiles(dataSet, fieldName, templateDir):
     files = map(lambda record:
                 os.path.normpath(os.path.join(srcPath, testData.field(record, fieldName))),
                 dataSet)
+    files = list(files)  # copy data from map object to list to make it reusable
     for currentFile in files:
         if not neededFilePresent(currentFile):
             return []

tests/system/shared/utils.py

@@ -513,8 +513,13 @@ def progressBarWait(timeout=60000, warn=True):
     checkIfObjectExists(":Qt Creator_Core::Internal::ProgressBar", False, timeout)
 
 def readFile(filename):
-    with open(filename, "r") as f:
-        return f.read()
+    try:
+        with open(filename, "r") as f:
+            return f.read()
+    except:
+        # Read file as binary
+        with open(filename, "rb") as f:
+            return f.read()
 
 def simpleFileName(navigatorFileName):
     # try to find the last part of the given name, assume it's inside a (folder) structure

tests/system/suite_editors/tst_clean_whitespaces/test.py

@@ -12,7 +12,7 @@ TripleTab = '\t\t\t'
 def main():
     files = map(lambda record: os.path.join(srcPath, testData.field(record, "filename")),
                 testData.dataset("files.tsv"))
-    files = filter(lambda x: not x.endswith(".bin"), files)
+    files = list(filter(lambda x: not x.endswith(".bin"), files))
     for currentFile in files:
         if not neededFilePresent(currentFile):
             return

tests/system/suite_editors/tst_select_all/test.py

@@ -8,7 +8,7 @@ source("../../shared/qtcreator.py")
 def main():
     files = map(lambda record: os.path.join(srcPath, testData.field(record, "filename")),
                 testData.dataset("files.tsv"))
-    files = filter(lambda x: not x.endswith(".bin"), files)
+    files = list(filter(lambda x: not x.endswith(".bin"), files))
     for currentFile in files:
         if not neededFilePresent(currentFile):
             return