diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-08 19:55:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-08 19:55:53 (GMT) |
| commit | f1a6ef2898322b44be739be43d45d17ebbf90919 (patch) | |
| tree | 5e84dd02f0260309c101e07e9be10bd8ad361f4d /tests | |
| parent | 1866cb339a53893792e4c3b894510feb7744324f (diff) | |
| parent | 1f46c72e313f1e223e7abb81dea48f4f5f68ebf7 (diff) | |
| download | Qt-f1a6ef2898322b44be739be43d45d17ebbf90919.zip Qt-f1a6ef2898322b44be739be43d45d17ebbf90919.tar.gz Qt-f1a6ef2898322b44be739be43d45d17ebbf90919.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
src/src.pro
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml b/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml index 3f00e68..408ad87 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml +++ b/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml @@ -10,7 +10,7 @@ Rectangle { width: 100; height: 100 color: Qt.rgba(1,0,0) Behavior on x { - NumberAnimation { objectName: "MyAnim"; target: redRect; property: "y"; to: 300; repeat: true} + NumberAnimation { id: myAnim; objectName: "MyAnim"; target: redRect; property: "y"; to: 300; repeat: true} } } |