diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-22 12:45:42 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-22 12:45:42 (GMT) |
| commit | df874ce60baf0350b23717853107a9bcc65a5200 (patch) | |
| tree | becb8a7fd1fcb87a386fdb711f4e5aa7beee31b6 /demos | |
| parent | e39e53373754f45cf49eee5232598affec41b21c (diff) | |
| parent | c1bf731ddeb035045cda395e77327d9be4635bb3 (diff) | |
| download | Qt-df874ce60baf0350b23717853107a9bcc65a5200.zip Qt-df874ce60baf0350b23717853107a9bcc65a5200.tar.gz Qt-df874ce60baf0350b23717853107a9bcc65a5200.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/webbrowser/content/FlickableWebView.qml | 5 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/webbrowser.qml | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml index 62da2ea..fb479d2 100644 --- a/demos/declarative/webbrowser/content/FlickableWebView.qml +++ b/demos/declarative/webbrowser/content/FlickableWebView.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import Qt 4.7 -import org.webkit 1.0 +import QtWebKit 1.0 Flickable { property alias title: webView.title @@ -90,7 +90,6 @@ Flickable { url: fixUrl(webBrowser.urlString) smooth: false // We don't want smooth scaling, since we only scale during (fast) transitions focus: true - zoomFactor: 1 onAlert: console.log(message) @@ -114,7 +113,7 @@ Flickable { preferredWidth: flickable.width preferredHeight: flickable.height - contentsScale: 1/zoomFactor + contentsScale: 1 onContentsSizeChanged: { // zoom out contentsScale = Math.min(1,flickable.width / contentsSize.width) diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 53ba6da..3bff0fe 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import Qt 4.7 -import org.webkit 1.0 +import QtWebKit 1.0 import "content" |