diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-25 11:28:35 (GMT) |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-25 11:28:35 (GMT) |
commit | 6729645b28f6acfeab9bb0bc488ca4143c480f5a (patch) | |
tree | 460b440bdaa684f42f0bd8d024829673747cb727 /examples/declarative/fillmode/fillmode.qml | |
parent | ea0b7da7f5c206c436999b35bc2b55fb8863ecfe (diff) | |
parent | 3eed4c454a58b38c895925b74e47a0b1b747df80 (diff) | |
download | Qt-6729645b28f6acfeab9bb0bc488ca4143c480f5a.zip Qt-6729645b28f6acfeab9bb0bc488ca4143c480f5a.tar.gz Qt-6729645b28f6acfeab9bb0bc488ca4143c480f5a.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
Diffstat (limited to 'examples/declarative/fillmode/fillmode.qml')
-rw-r--r-- | examples/declarative/fillmode/fillmode.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/fillmode/fillmode.qml b/examples/declarative/fillmode/fillmode.qml index ab0f81c..3f2020c 100644 --- a/examples/declarative/fillmode/fillmode.qml +++ b/examples/declarative/fillmode/fillmode.qml @@ -5,7 +5,7 @@ Image { height: 250 source: "face.png" SequentialAnimation on fillMode { - repeat: true + loops: Animation.Infinite PropertyAction { value: Image.Stretch } PropertyAction { target: label; property: "text"; value: "Stretch" } PauseAnimation { duration: 1000 } |