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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  fix line endings

1 files changed, 35 insertions, 35 deletions

diff --git a/tests/auto/declarative/qmlvisual/webview/flickable/flickweb.qml b/tests/auto/declarative/qmlvisual/webview/flickable/flickweb.qml
index 6063226..af09389 100644
--- a/tests/auto/declarative/qmlvisual/webview/flickable/flickweb.qml
+++ b/tests/auto/declarative/qmlvisual/webview/flickable/flickweb.qml
@@ -1,35 +1,35 @@
-import QtQuick 1.0

-import QtWebKit 1.0

-

-Flickable {

-    id: flickable

-    width: 320

-    height:  200

-    contentWidth: Math.max(flickable.width,webView.width)

-    contentHeight: Math.max(flickable.height,webView.height)

-    pressDelay: 100

-

-    WebView {

-        id: webView

-        transformOrigin: Item.TopLeft

-        smooth: false // We don't want smooth scaling, since we only scale during (fast) transitions

-        url:  "test.html"

-        preferredWidth: flickable.width

-        preferredHeight: flickable.height

-        contentsScale: 1

-        onContentsSizeChanged: {

-            // zoom out

-            contentsScale = Math.min(1,flickable.width / contentsSize.width)

-        }

-    }

-

-    Rectangle {

-        id: button

-        width: 50; height: 50; color: "red"

-        MouseArea {

-            anchors.fill: parent

-            onPressed: button.color = "blue"

-            onReleased: button.color = "green"

-        }

-    }

-}

+import QtQuick 1.0
+import QtWebKit 1.0
+
+Flickable {
+    id: flickable
+    width: 320
+    height:  200
+    contentWidth: Math.max(flickable.width,webView.width)
+    contentHeight: Math.max(flickable.height,webView.height)
+    pressDelay: 100
+
+    WebView {
+        id: webView
+        transformOrigin: Item.TopLeft
+        smooth: false // We don't want smooth scaling, since we only scale during (fast) transitions
+        url:  "test.html"
+        preferredWidth: flickable.width
+        preferredHeight: flickable.height
+        contentsScale: 1
+        onContentsSizeChanged: {
+            // zoom out
+            contentsScale = Math.min(1,flickable.width / contentsSize.width)
+        }
+    }
+
+    Rectangle {
+        id: button
+        width: 50; height: 50; color: "red"
+        MouseArea {
+            anchors.fill: parent
+            onPressed: button.color = "blue"
+            onReleased: button.color = "green"
+        }
+    }
+}