diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-25 14:53:09 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-25 14:53:09 (GMT) |
| commit | 8d720825279c8bf06d28b1f756031402f117002b (patch) | |
| tree | 5ea180f93387223c532d76f53d74054ea7a6f2b4 /tests/auto/declarative/qdeclarativespringfollow/data | |
| parent | 8928e37c8b1b375e74c5981915c034123de11b3d (diff) | |
| parent | d6197028818e51e78249b029a823fde1b0ffde03 (diff) | |
| download | Qt-8d720825279c8bf06d28b1f756031402f117002b.zip Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.gz Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.bz2 | |
Merge branch 'master' of git:qt/qt-qml
Conflicts:
src/declarative/graphicsitems/qdeclarativeparticles.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativespringfollow/data')
3 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml new file mode 100644 index 0000000..959d206 --- /dev/null +++ b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml @@ -0,0 +1,4 @@ +import Qt 4.6 + +SpringFollow { +} diff --git a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml new file mode 100644 index 0000000..7c81fb5 --- /dev/null +++ b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml @@ -0,0 +1,8 @@ +import Qt 4.6 + +SpringFollow { + source: 1.44; velocity: 0.9 + spring: 1.0; damping: 0.5 + epsilon: 0.25; modulus: 360.0 + mass: 2.0; enabled: true +} diff --git a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml new file mode 100644 index 0000000..6fec55b --- /dev/null +++ b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml @@ -0,0 +1,8 @@ +import Qt 4.6 + +SpringFollow { + source: 1.44; velocity: 0.9 + spring: 1.0; damping: 0.5 + epsilon: 0.25; modulus: 360.0 + mass: 2.0; enabled: false +} |