diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-26 04:58:10 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-26 04:58:10 (GMT) |
| commit | 13086523d7181d5628872c74030b460e5f7388a5 (patch) | |
| tree | f5b3317c138fb18d47d8b2e0060bc4a8512da1a1 /demos/declarative/webbrowser/webbrowser.qml | |
| parent | 3c45c081ce33f05ae200d252ebb5e9e1484bcc6d (diff) | |
| parent | 40a59d973c324e45954481f608e1bfc2b9579300 (diff) | |
| download | Qt-13086523d7181d5628872c74030b460e5f7388a5.zip Qt-13086523d7181d5628872c74030b460e5f7388a5.tar.gz Qt-13086523d7181d5628872c74030b460e5f7388a5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/states/states.qml
examples/declarative/states/transitions.qml
examples/declarative/tutorials/helloworld/t3/tutorial3.qml
src/declarative/util/qmlanimation.cpp
Diffstat (limited to 'demos/declarative/webbrowser/webbrowser.qml')
| -rw-r--r-- | demos/declarative/webbrowser/webbrowser.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 3dcc20d..4c6a177 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -161,7 +161,7 @@ Item { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { target: Header properties: "progressOff" easing: "easeInOutQuad" @@ -259,7 +259,7 @@ Item { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "opacity" easing: "easeInOutQuad" duration: 300 @@ -315,7 +315,7 @@ Item { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "opacity" easing: "easeInOutQuad" duration: 320 @@ -350,13 +350,13 @@ Item { value: false } ParallelAnimation { - NumericAnimation { + NumberAnimation { target: WebView properties: "zoomedOut" easing: "easeInOutQuad" duration: 200 } - NumericAnimation { + NumberAnimation { target: Flick properties: "xPosition,yPosition" easing: "easeInOutQuad" |