diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 18:56:41 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 18:56:41 (GMT) |
commit | 57c6b39a72e037fe50cda7005cea79d1c4dcd888 (patch) | |
tree | 1c594add8e5b8598322d2cd88a537e965738cac0 /examples/declarative/border-image/content/MyBorderImage.qml | |
parent | 0a8379d9f01118d7ff0121e6ecbbc0307e1e7f63 (diff) | |
parent | d340dc6e4b3f1f4f8737d0d1d34e76ae68e007d6 (diff) | |
download | Qt-57c6b39a72e037fe50cda7005cea79d1c4dcd888.zip Qt-57c6b39a72e037fe50cda7005cea79d1c4dcd888.tar.gz Qt-57c6b39a72e037fe50cda7005cea79d1c4dcd888.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'examples/declarative/border-image/content/MyBorderImage.qml')
-rw-r--r-- | examples/declarative/border-image/content/MyBorderImage.qml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/examples/declarative/border-image/content/MyBorderImage.qml b/examples/declarative/border-image/content/MyBorderImage.qml index 2573a14..b47df7b 100644 --- a/examples/declarative/border-image/content/MyBorderImage.qml +++ b/examples/declarative/border-image/content/MyBorderImage.qml @@ -20,14 +20,26 @@ Item { SequentialAnimation on width { loops: Animation.Infinite - NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"} - NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" } + NumberAnimation { + from: container.minWidth; to: container.maxWidth + duration: 2000; easing.type: Easing.InOutQuad + } + NumberAnimation { + from: container.maxWidth; to: container.minWidth + duration: 2000; easing.type: Easing.InOutQuad + } } SequentialAnimation on height { loops: Animation.Infinite - NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"} - NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" } + NumberAnimation { + from: container.minHeight; to: container.maxHeight + duration: 2000; easing.type: Easing.InOutQuad + } + NumberAnimation { + from: container.maxHeight; to: container.minHeight + duration: 2000; easing.type: Easing.InOutQuad + } } border.top: container.margin |