diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-18 05:53:39 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-18 05:53:39 (GMT) |
| commit | c098fef1f410c54f0655af9532d45f80a77b3a91 (patch) | |
| tree | f09693983aad70170caaaf60abc4c272695f4643 | |
| parent | f93cc8dda10c7f6a7a408d818ecafda23150e20c (diff) | |
| parent | bbcba4d1266fcfbd7e976fb4611cda39964f4529 (diff) | |
| download | Qt-c098fef1f410c54f0655af9532d45f80a77b3a91.zip Qt-c098fef1f410c54f0655af9532d45f80a77b3a91.tar.gz Qt-c098fef1f410c54f0655af9532d45f80a77b3a91.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | demos/declarative/webbrowser/webbrowser.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 23e0a20..0f6ed25 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -216,7 +216,7 @@ Item { preferredHeight: flickable.height zoomFactor: flickable.width > 980 ? 1 : flickable.width/980 - onUrlChanged: { if (url != null) { webBrowser.urlString = url.toString(); } } + onUrlChanged: { if (url != null) { editUrl.text = url.toString(); } } onDoubleClick: { if (!heuristicZoom(clickX,clickY,2.5)) { var zf = flickable.width > 980 ? 1 : flickable.width/980; |