Merge remote-tracking branch 'origin/10.0'

Change-Id: I98e5e1ad43103984b490c65cdeed84b7414303b3

3 files changed, 7 insertions, 6 deletions

diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 7b58b95c9f..d05a3b37a8 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -131,7 +131,7 @@ def __createProjectHandleQtQuickSelection__(minimumQtVersion):
         selectFromCombo(comboBox, minimumQtVersion)
     except:
         t,v = sys.exc_info()[:2]
-        test.fatal("Exception while trying to select Qt version", "%s :%s" % (t.__name__, str(v)))
+        test.fatal("Exception while trying to select Qt version", "%s: %s" % (t.__name__, str(v)))
     clickButton(waitForObject(":Next_QPushButton"))
     return minimumQtVersion
 
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 543c3c7ad4..d49b23350d 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -12,10 +12,10 @@ import subprocess;
 import sys
 import errno;
 from datetime import datetime,timedelta;
-try:
-    import __builtin__                  # Python 2
-except ImportError:
-    import builtins as __builtin__      # Python 3
+if sys.version_info.major > 2:
+    import builtins as __builtin__
+else:
+    import __builtin__
 
 
 srcPath = ''
@@ -382,6 +382,7 @@ def copySettingsToTmpDir(destination=None, omitFiles=[]):
     substituteUnchosenTargetABIs(tmpSettingsDir)
     SettingsPath = ['-settingspath', '"%s"' % tmpSettingsDir]
 
+test.log("Test is running on Python %s" % sys.version)
 # current dir is directory holding qtcreator.py
 origSettingsDir = os.path.abspath(os.path.join(os.getcwd(), "..", "..", "settings"))
 
diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py
index 3601c81a37..7cacdf6e51 100644
--- a/tests/system/suite_HELP/tst_HELP02/test.py
+++ b/tests/system/suite_HELP/tst_HELP02/test.py
@@ -36,7 +36,7 @@ def checkQtCreatorHelpVersion(expectedVersion):
         helpContentWidget = waitForObject(':Qt Creator_QHelpContentWidget', 5000)
         waitFor("any(map(rightStart, dumpItems(helpContentWidget.model())))", 10000)
         items = dumpItems(helpContentWidget.model())
-        test.compare(filter(rightStart, items)[0],
+        test.compare(list(filter(rightStart, items))[0],
                      'Qt Creator Manual %s' % expectedVersion,
                      'Verifying whether manual uses expected version.')
     except: