diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-30 13:49:21 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-30 13:49:21 (GMT) |
| commit | 00f7426f3906361fb5addb36e428648eee5e2983 (patch) | |
| tree | c299b0f6f323ea2f37161cfdf5b2fb33bbe35673 /tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml | |
| parent | 429b747d492ef038c2ed58a9a72060d951721252 (diff) | |
| parent | ae305abfdb795b472b2b9d200bf3b11af00d7d1f (diff) | |
| download | Qt-00f7426f3906361fb5addb36e428648eee5e2983.zip Qt-00f7426f3906361fb5addb36e428648eee5e2983.tar.gz Qt-00f7426f3906361fb5addb36e428648eee5e2983.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
src/3rdparty/phonon/ds9/iodevicereader.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml new file mode 100644 index 0000000..cfece41 --- /dev/null +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml @@ -0,0 +1,3 @@ +import Qt 4.6 + +SmoothedAnimation {} |