diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-25 00:29:57 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-25 00:29:57 (GMT) |
commit | 45ba7232441c78b9fd6864f422d842f836aafdf3 (patch) | |
tree | df515a4f4467ffb73fe9e1ea8ddd115ccff48b89 /tests/auto/declarative/visual/qdeclarativetext | |
parent | edf7d8c450b1dbc55e10d68083e19e04366062ef (diff) | |
parent | d232ff28fc97a6bac3ee9ac054109517e3a47cf4 (diff) | |
download | Qt-45ba7232441c78b9fd6864f422d842f836aafdf3.zip Qt-45ba7232441c78b9fd6864f422d842f836aafdf3.tar.gz Qt-45ba7232441c78b9fd6864f422d842f836aafdf3.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/visual/qdeclarativetext')
-rw-r--r-- | tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml index c163e05..7b1042b 100644 --- a/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml +++ b/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml @@ -5,7 +5,7 @@ Rectangle { height: 100 Text { - width: NumberAnimation { from: 500; to: 0; repeat: true; duration: 5000 } + width: NumberAnimation { from: 500; to: 0; loops: Qt.Infinite; duration: 5000 } elide: Text.ElideRight text: 'Here is some very long text that we should truncate when sizing window' } diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml index ca41eab..21763b2 100644 --- a/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml +++ b/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml @@ -11,7 +11,7 @@ Rectangle { anchors.centerIn: parent Text { id: myText - width: NumberAnimation { from: 500; to: 0; repeat: true; duration: 1000 } + width: NumberAnimation { from: 500; to: 0; loops: Qt.Infinite; duration: 1000 } elide: "ElideRight" text: "Brevity is the soul of wit, and tediousness the limbs and outward flourishes.\x9CBrevity is a great charm of eloquence.\x9CBe concise!\x9CSHHHHHHHHHHHHHHHHHHHHHHHHHHHH" } |