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 /tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.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 'tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml')
| -rw-r--r-- | tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml index 6a4e7fa..199f71f 100644 --- a/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml +++ b/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml @@ -10,7 +10,7 @@ import Qt 4.6 Rectangle { id:top; color: "black"; width: 3; height: 1; x: -1; y:0} Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;} opacity: 1 - opacity: SequentialAnimation { running: cPage.parent.focus == true; repeat: true; + opacity: SequentialAnimation { running: cPage.parent.focus == true; loops: Animation.Infinite; NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"} NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"} } |