Merge remote-tracking branch 'origin/2.4'

Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4

3 files changed, 25 insertions, 24 deletions

diff --git a/tests/system/settings/unix/Nokia/qtversion.xml b/tests/system/settings/unix/Nokia/qtversion.xml
index 00d17a58b8..a06c086f4f 100644
--- a/tests/system/settings/unix/Nokia/qtversion.xml
+++ b/tests/system/settings/unix/Nokia/qtversion.xml
@@ -43,8 +43,19 @@
   </valuemap>
  </data>
  <data>
+  <variable>QtVersion.4</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">1</value>
+   <value type="QString" key="Name">Harmattan Target (Qt SDK)</value>
+   <value type="QString" key="QMakePath">~/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/qmake</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
+   <value type="QString" key="autodetectionSource">SDK.MeeGo_1.2_Harmattan_API</value>
+   <value type="bool" key="isAutodetected">true</value>
+  </valuemap>
+ </data>
+ <data>
   <variable>QtVersion.Count</variable>
-  <value type="int">4</value>
+  <value type="int">5</value>
  </data>
  <data>
   <variable>Version</variable>
diff --git a/tests/system/settings/windows/Nokia/qtversion.xml b/tests/system/settings/windows/Nokia/qtversion.xml
index f4b46e5056..c368196718 100644
--- a/tests/system/settings/windows/Nokia/qtversion.xml
+++ b/tests/system/settings/windows/Nokia/qtversion.xml
@@ -74,12 +74,12 @@
   <variable>QtVersion.6</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">12</value>
-   <value type="QString" key="Name">Qt 4.7.3 for Symbian^3 (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbian3qt473/bin/qmake.exe</value>
+   <value type="QString" key="Name">Qt 4.7.4 for Symbian Anna (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbian3qt474/bin/qmake.exe</value>
    <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Symbian</value>
    <value type="QString" key="SBSv2Directory">C:/QtSDK/Symbian/tools/sbs/bin</value>
-   <value type="QString" key="SystemRoot">C:/QtSDK/Symbian/SDKs/Symbian3Qt473/</value>
-   <value type="QString" key="autodetectionSource">SDK.C:/QtSDK/Symbian/SDKs/Symbian3Qt473</value>
+   <value type="QString" key="SystemRoot">C:/QtSDK/Symbian/SDKs/Symbian3Qt474/</value>
+   <value type="QString" key="autodetectionSource">SDK.C:/QtSDK/Symbian/SDKs/Symbian3Qt474</value>
    <value type="bool" key="isAutodetected">true</value>
   </valuemap>
  </data>
@@ -87,7 +87,7 @@
   <variable>QtVersion.7</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">13</value>
-   <value type="QString" key="Name">Qt 4.7.3 for Symbian^1 (Qt SDK)</value>
+   <value type="QString" key="Name">Qt 4.7.3 for S60 5th Edition (Qt SDK)</value>
    <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbian1qt473/bin/qmake.exe</value>
    <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Symbian</value>
    <value type="QString" key="SBSv2Directory"></value>
@@ -99,20 +99,9 @@
  <data>
   <variable>QtVersion.8</variable>
   <valuemap type="QVariantMap">
-   <value type="int" key="Id">14</value>
-   <value type="QString" key="Name">Harmattan Platform API (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/madde/targets/harmattan-platform-api/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
-   <value type="QString" key="autodetectionSource">SDK.Harmattan_Platform_API</value>
-   <value type="bool" key="isAutodetected">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>QtVersion.9</variable>
-  <valuemap type="QVariantMap">
    <value type="int" key="Id">15</value>
-   <value type="QString" key="Name">MeeGo 1.2 Harmattan API (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/madde/targets/harmattan-nokia-meego-api/bin/qmake.exe</value>
+   <value type="QString" key="Name">Harmattan Target (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/madde/targets/harmattan_10.2011.34-1/bin/qmake.exe</value>
    <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
    <value type="QString" key="autodetectionSource">SDK.MeeGo_1.2_Harmattan_API</value>
    <value type="bool" key="isAutodetected">true</value>
@@ -120,7 +109,7 @@
  </data>
  <data>
   <variable>QtVersion.Count</variable>
-  <value type="int">10</value>
+  <value type="int">9</value>
  </data>
  <data>
   <variable>Version</variable>
diff --git a/tests/system/suite_qtquick/tst_qml_indent/test.py b/tests/system/suite_qtquick/tst_qml_indent/test.py
index ef7a8a0cec..1fd686bb33 100644
--- a/tests/system/suite_qtquick/tst_qml_indent/test.py
+++ b/tests/system/suite_qtquick/tst_qml_indent/test.py
@@ -43,11 +43,10 @@ def prepareQmlFile():
     originalText = "%s" % editor.plainText
     indented = editor.plainText
     unindented = ""
-    lines = str(indented).split("\n")
+    lines = str(indented).splitlines()
     test.log("Using %d lines..." % len(lines))
     for line in lines:
         unindented += line.lstrip()+"\n"
-    unindented=unindented[0:-1]
     editor.plainText = unindented
     return True
 
@@ -63,11 +62,13 @@ def testReIndent():
                            "window=':Qt Creator_Core::Internal::MainWindow'}")
     type(editor, "<Ctrl+A>")
     test.log("calling re-indent")
+    starttime = datetime.utcnow()
     type(editor, "<Ctrl+I>")
-    waitFor("textHasChanged==True", 20000)
+    waitFor("textHasChanged==True", 25000)
+    endtime = datetime.utcnow()
     textAfterReIndent = "%s" % editor.plainText
     if originalText==textAfterReIndent:
-        test.passes("Text successfully reindented...")
+        test.passes("Text successfully re-indented within %d seconds" % (endtime-starttime).seconds)
     else:
         # shrink the texts - it's huge output that takes long time to finish & screenshot is taken as well
         originalText = shrinkText(originalText, 20)