Merge remote-tracking branch 'origin/4.6'

Change-Id: I959428882b9da427c6bf522145646048141888c6

4 files changed, 4 insertions, 15 deletions

diff --git a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml
index c7548b95d1..f64b5ba055 100644
--- a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml
@@ -18,7 +18,7 @@
      <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
     </valuemap>
     <value type="QString" key="QtPM4.mkSpecInformation"></value>
-    <value type="int" key="QtSupport.QtInformation">4</value>
+    <value type="int" key="QtSupport.QtInformation">2</value>
    </valuemap>
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{f16848fc-b615-43b5-b0cc-16a9f57fb573}</value>
@@ -112,7 +112,7 @@
  </data>
  <data>
   <variable>Profile.Default</variable>
-  <value type="QString">{a1e860d1-c241-4abf-80fe-cf0c9f0a43b3}</value>
+  <value type="QString">{fc5f34fd-e703-4f4c-85ce-ea5bf5869e6a}</value>
  </data>
  <data>
   <variable>Version</variable>
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index d06398a159..c18173eea6 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -193,18 +193,6 @@ class Qt5Path:
 
     @staticmethod
     def __createPlatformQtPath__(qt5Minor):
-        # special handling for Qt5.2
-        if qt5Minor == 2:
-            if platform.system() in ('Microsoft', 'Windows'):
-                return "C:/Qt/Qt5.2.1/5.2.1/msvc2010"
-            elif platform.system() == 'Linux':
-                if __is64BitOS__():
-                    return os.path.expanduser("~/Qt5.2.1/5.2.1/gcc_64")
-                else:
-                    return os.path.expanduser("~/Qt5.2.1/5.2.1/gcc")
-            else:
-                return os.path.expanduser("~/Qt5.2.1/5.2.1/clang_64")
-        # Qt5.3+
         if platform.system() in ('Microsoft', 'Windows'):
             return "C:/Qt/Qt5.%d.1" % qt5Minor
         else:
diff --git a/tests/system/suite_SCOM/tst_SCOM04/test.py b/tests/system/suite_SCOM/tst_SCOM04/test.py
index 5698cae8eb..e7136cb0d4 100644
--- a/tests/system/suite_SCOM/tst_SCOM04/test.py
+++ b/tests/system/suite_SCOM/tst_SCOM04/test.py
@@ -32,6 +32,7 @@ def main():
     expectedErrorAlternatives = ["'SyntaxError' was not declared in this scope",
                                  "\xe2\x80\x98SyntaxError\xe2\x80\x99 was not declared in this scope",
                                  "'SyntaxError' : undeclared identifier",
+                                 '"SyntaxError" : undeclared identifier',
                                  "use of undeclared identifier 'SyntaxError'",
                                  "unknown type name 'SyntaxError'"]
     startApplication("qtcreator" + SettingsPath)
diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py
index 34d0de76aa..b6d4e1c940 100644
--- a/tests/system/suite_WELP/tst_WELP03/test.py
+++ b/tests/system/suite_WELP/tst_WELP03/test.py
@@ -80,7 +80,7 @@ def main():
     expect = (("QTableView", "unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'",
                "examples list"),
               ("QLineEdit", "placeholderText='Search in Examples...'", "examples search line edit"),
-              ("QComboBox", "text~='.*Qt.*' visible='1'", "Qt version combo box"))
+              ("QComboBox", "currentText~='.*Qt.*' visible='1'", "Qt version combo box"))
     search = "{type='%s' %s}"
     test.verify(all(map(checkIfObjectExists, (search % (exp[0], exp[1]) for exp in expect))),
                 "Verifying: 'Examples' topic is opened and the examples are shown.")