diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-05-05 00:43:51 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-05-05 00:43:51 (GMT) |
commit | 22959526d81bfd2195d389eddc88c626350b6925 (patch) | |
tree | b3dd0df107e4e15ded2b30e40ae4d721428bf61c /demos/declarative/webbrowser/webbrowser.qml | |
parent | 0e75846b831bbeb4794cc4e3d00cd3096726d35e (diff) | |
parent | fab8fa152901cb84132f11b52f950c0dbb6d7a23 (diff) | |
download | Qt-22959526d81bfd2195d389eddc88c626350b6925.zip Qt-22959526d81bfd2195d389eddc88c626350b6925.tar.gz Qt-22959526d81bfd2195d389eddc88c626350b6925.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos/declarative/webbrowser/webbrowser.qml')
-rw-r--r-- | demos/declarative/webbrowser/webbrowser.qml | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 709d649..c754543 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -3,10 +3,7 @@ import "content" Item { id: WebBrowser - properties: Property { - name: "url" - value: "http://www.qtsoftware.com" - } + property var url : "http://www.qtsoftware.com" width: 640 height: 480 @@ -163,11 +160,8 @@ Item { onClicked: { proxy.focus=true } } } - properties: Property { - name: "progressOff" - value: 1 - type: "Real" - } + + property real progressOff : 1 states: [ State { name: "Normal" @@ -210,16 +204,8 @@ Item { anchors.left: parent.left anchors.right: parent.right - properties: Property { - name: "centerX" - value: 0 - type: "Real" - } - properties: Property { - name: "centerY" - value: 0 - type: "Real" - } + property real centerX : 0 + property real centerY : 0 WebView { id: WebView @@ -237,11 +223,7 @@ Item { onUrlChanged: { Flick.xPosition=0; Flick.yPosition=0; zoomOut() } onDoubleClick: { toggleZoom() } - properties: Property { - name: "zoomedOut" - type: "real" - value: 1 - } + property real zoomedOut : 1 } Rect { id: WebViewTint |