Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (76 commits)
  Qt.Infinite -> Animation.Infinite
  Doc fix.
  Skip tests for now
  Make autotest work on windows.
  Remove faulty assert - the precondition is checked for correctly later on
  Ensure currentIndex is updated when items inserted before currentIndex
  Replace Animation's repeat property with loops.
  Fix compile in namespace.
  Compile with qtnamespace
  Disallow the implicit QDeclarativeGuardedContextData copy constructor
  Doc
  Fix leak.
  StateChangeScript doc.
  A StateChangeScript should never be run when leaving the state.
  ScriptAction doc.
  Rename stateChangeScriptName to scriptName.
  Doc
  Document QML security considerations.
  Fix flicking views at boundary with StricthighlighRange
  Fix abort in flipable
  ...

2 files changed, 28 insertions, 35 deletions

diff --git a/tools/qml/content/Browser.qml b/tools/qml/content/Browser.qml
index 62996ef..391ded8 100644
--- a/tools/qml/content/Browser.qml
+++ b/tools/qml/content/Browser.qml
@@ -22,38 +22,36 @@ Rectangle {
 
     SystemPalette { id: palette }
 
-    Script {
-        function down(path) {
-            if (folders == folders1) {
-                view = view2
-                folders = folders2;
-                view1.state = "exitLeft";
-            } else {
-                view = view1
-                folders = folders1;
-                view2.state = "exitLeft";
-            }
-            view.x = root.width;
-            view.state = "current";
-            view.focus = true;
-            folders.folder = path;
+    function down(path) {
+        if (folders == folders1) {
+            view = view2
+            folders = folders2;
+            view1.state = "exitLeft";
+        } else {
+            view = view1
+            folders = folders1;
+            view2.state = "exitLeft";
         }
-        function up() {
-            var path = folders.parentFolder;
-            if (folders == folders1) {
-                view = view2
-                folders = folders2;
-                view1.state = "exitRight";
-            } else {
-                view = view1
-                folders = folders1;
-                view2.state = "exitRight";
-            }
-            view.x = -root.width;
-            view.state = "current";
-            view.focus = true;
-            folders.folder = path;
+        view.x = root.width;
+        view.state = "current";
+        view.focus = true;
+        folders.folder = path;
+    }
+    function up() {
+        var path = folders.parentFolder;
+        if (folders == folders1) {
+            view = view2
+            folders = folders2;
+            view1.state = "exitRight";
+        } else {
+            view = view1
+            folders = folders1;
+            view2.state = "exitRight";
         }
+        view.x = -root.width;
+        view.state = "current";
+        view.focus = true;
+        folders.folder = path;
     }
 
     Component {
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 6660947..d4ceb0b 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -51,7 +51,6 @@
 #include <qdeclarativeengine.h>
 #include <qdeclarativenetworkaccessmanagerfactory.h>
 #include "qdeclarative.h"
-#include <private/qperformancelog_p_p.h>
 #include <private/qabstractanimation_p.h>
 #include <QAbstractAnimation>
 #include "deviceskin.h"
@@ -1221,7 +1220,6 @@ void QDeclarativeViewer::keyPressEvent(QKeyEvent *event)
                  << "F5 - reload QML\n"
                  << "F6 - show object tree\n"
                  << "F7 - show timing\n"
-                 << "F8 - show performance (if available)\n"
                  << "F9 - toggle video recording\n"
                  << "F10 - toggle orientation\n"
                  << "device keys: 0=quit, 1..8=F1..F8"
@@ -1233,9 +1231,6 @@ void QDeclarativeViewer::keyPressEvent(QKeyEvent *event)
         takeSnapShot();
     } else if (event->key() == Qt::Key_F5 || (event->key() == Qt::Key_5 && devicemode)) {
         reload();
-    } else if (event->key() == Qt::Key_F8 || (event->key() == Qt::Key_8 && devicemode)) {
-        QPerformanceLog::displayData();
-        QPerformanceLog::clear();
     } else if (event->key() == Qt::Key_F9 || (event->key() == Qt::Key_9 && devicemode)) {
         toggleRecording();
     } else if (event->key() == Qt::Key_F10) {