summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-05-13 16:36:15 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-05-13 16:36:15 (GMT)
commitcce4e4393277298b5b5246ab79e615173b2cb13a (patch)
tree239d0fab1217e07748510cca01a733d348ee7da5 /src/imports
parent3c1cb52aae6f7a5bd94c28a0b183e2375526724b (diff)
downloadQt-cce4e4393277298b5b5246ab79e615173b2cb13a.zip
Qt-cce4e4393277298b5b5246ab79e615173b2cb13a.tar.gz
Qt-cce4e4393277298b5b5246ab79e615173b2cb13a.tar.bz2
Minor declarative webview tweaks
Added a comment to the class docs, and cleaned up the visual tests a little. However the visual tests are old and text heavy, and since we never seem to check them we might wait on updating them for a little longer.
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/webkit/qdeclarativewebview.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp
index 9e24007..36a25f6 100644
--- a/src/imports/webkit/qdeclarativewebview.cpp
+++ b/src/imports/webkit/qdeclarativewebview.cpp
@@ -126,6 +126,9 @@ public:
dynamically adjust to a size appropriate for the content.
This width may be large for typical online web pages.
+ If the width or height is explictly set, the rendered website
+ will be clipped, not scaled, to fit into the set dimensions.
+
If the preferredWidth is set, the width will be this amount or larger,
usually laying out the web content to fit the preferredWidth.
@@ -134,8 +137,8 @@ public:
WebView {
url: "http://www.nokia.com"
- width: 490
- height: 400
+ preferredWidth: 490
+ preferredHeight: 400
scale: 0.5
smooth: false
smoothCache: true