summaryrefslogtreecommitdiffstats
path: root/demos/declarative
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2010-06-18 12:22:13 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2010-06-18 12:23:45 (GMT)
commit8f1def139d6eaf99c22b43536d056964e0d41245 (patch)
tree8bfa47eb4a9632bebe45f8896c511c6833ea84f9 /demos/declarative
parent0ce072e74aea546852b6bb4b7f0c0fe0e2678aa5 (diff)
downloadQt-8f1def139d6eaf99c22b43536d056964e0d41245.zip
Qt-8f1def139d6eaf99c22b43536d056964e0d41245.tar.gz
Qt-8f1def139d6eaf99c22b43536d056964e0d41245.tar.bz2
Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit
Also change a bit the demo due to a little API change. The module is not org.webkit but QtWebKit now. Reviewed-by:simon hausmann
Diffstat (limited to 'demos/declarative')
-rw-r--r--demos/declarative/webbrowser/content/FlickableWebView.qml5
-rw-r--r--demos/declarative/webbrowser/webbrowser.qml2
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"