summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-08 17:20:44 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-08 17:20:44 (GMT)
commit1f46c72e313f1e223e7abb81dea48f4f5f68ebf7 (patch)
tree3e43c9b2dc9225241e73529e1578bea6fff389a5
parentd241b5a663b9b9ad457ae3b2510b36b72a7bc316 (diff)
parent76615ac642ffbe2730321623c5f298bde6109b11 (diff)
downloadQt-1f46c72e313f1e223e7abb81dea48f4f5f68ebf7.zip
Qt-1f46c72e313f1e223e7abb81dea48f4f5f68ebf7.tar.gz
Qt-1f46c72e313f1e223e7abb81dea48f4f5f68ebf7.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix failing autotest.
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml2
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}
}
}