diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-16 06:20:04 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-16 06:20:04 (GMT) |
| commit | f80b8b67629dd71df1e6692867c700c03f833e65 (patch) | |
| tree | 4b1fa4ed065141fccaa322a105a9bdda7e96c17a | |
| parent | c01c0c9746fbd54d29683b79de2bf973e5c40cec (diff) | |
| parent | a8003df9c7d17a7cdb94161a0aa1b553a30a68e4 (diff) | |
| download | Qt-f80b8b67629dd71df1e6692867c700c03f833e65.zip Qt-f80b8b67629dd71df1e6692867c700c03f833e65.tar.gz Qt-f80b8b67629dd71df1e6692867c700c03f833e65.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | demos/declarative/flickr/mobile/TitleBar.qml | 1 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/content/FlickableWebView.qml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml index 72b779f..71d9385 100644 --- a/demos/declarative/flickr/mobile/TitleBar.qml +++ b/demos/declarative/flickr/mobile/TitleBar.qml @@ -12,6 +12,7 @@ Item { width: (parent.width * 2) - 55 ; height: parent.height function accept() { + imageDetails.closed() titleBar.state = "" background.state = "" rssModel.tags = editor.text diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml index 81904c6..46f45e0 100644 --- a/demos/declarative/webbrowser/content/FlickableWebView.qml +++ b/demos/declarative/webbrowser/content/FlickableWebView.qml @@ -45,7 +45,7 @@ Flickable { smoothCache: true // We do want smooth rendering fillColor: "white" focus: true - zoomFactor: 4 + zoomFactor: 1 onAlert: console.log(message) @@ -73,7 +73,7 @@ Flickable { contentsScale: 1/zoomFactor onContentsSizeChanged: { // zoom out - contentsScale = Math.min(0.25,flickable.width / contentsSize.width) + contentsScale = Math.min(1,flickable.width / contentsSize.width) } onUrlChanged: { // got to topleft |