summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-22 00:03:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-22 00:03:06 (GMT)
commit22427b168d54eec3a55f9f720ce65d511862d47f (patch)
tree7a03e77d2d57d427a1159d82c6cc892f4c171fd4 /demos
parent7f3d9a76e9d956d9e7e4398ac20785070e214958 (diff)
parenta090a9f42c0db1bbcce30db6165d5edbaa2c4456 (diff)
downloadQt-22427b168d54eec3a55f9f720ce65d511862d47f.zip
Qt-22427b168d54eec3a55f9f720ce65d511862d47f.tar.gz
Qt-22427b168d54eec3a55f9f720ce65d511862d47f.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
Diffstat (limited to 'demos')
-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"