summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2009-06-25 07:33:13 (GMT)
committerErik Verbruggen <erik.verbruggen@nokia.com>2009-06-25 07:33:13 (GMT)
commit5b52c348243e6459cc7faa4ee76a23c7fadcd299 (patch)
treebe4bee855e535651b5fa22e9554ce1732f6ece70 /demos
parent2020c692803a8a7839d85860d05174a193d9a848 (diff)
parent0362832c16f95c2909e2a68351e15242b7d1b795 (diff)
downloadQt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.zip
Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.tar.gz
Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos')
-rw-r--r--demos/declarative/webbrowser/webbrowser.qml5
1 files changed, 3 insertions, 2 deletions
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index a38d032..889ab87 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -197,7 +197,8 @@ Item {
cacheSize: 4000000
url: WebBrowser.url
- smooth: true
+ smooth: !Flick.moving
+ fillColor: "white"
focusable: true
focus: true
@@ -421,7 +422,7 @@ Item {
SetPropertyAction {
target: WebView
property: "smooth"
- value: true
+ value: !Flick.moving
}
}
}