diff options
author | Robert Loehning <robert.loehning@nokia.com> | 2010-12-01 15:52:17 (GMT) |
---|---|---|
committer | Robert Loehning <robert.loehning@nokia.com> | 2010-12-01 15:52:17 (GMT) |
commit | 0f8e39459b47b99195eb677e7a32784b325834bd (patch) | |
tree | 18adbb92aa851d3a20b9f4ecd5fca41ed2daf606 | |
parent | a6044059d3bb6a1f3f319c3f07e75b2e4258a56f (diff) | |
download | Qt-0f8e39459b47b99195eb677e7a32784b325834bd.zip Qt-0f8e39459b47b99195eb677e7a32784b325834bd.tar.gz Qt-0f8e39459b47b99195eb677e7a32784b325834bd.tar.bz2 |
fix line endings
-rw-r--r-- | tests/auto/declarative/qmlvisual/webview/flickable/flickweb.qml | 70 |
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" + } + } +} |