diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-04 02:58:53 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-04 02:58:53 (GMT) |
| commit | 95639d8f27300533419da0c8dd22c0cc5e63543e (patch) | |
| tree | 4e38f957e4226f5c5cc519c6ec5edfb65bfc59df | |
| parent | 1287332bfc1dfb85c59c309d9f2bf37b970013c9 (diff) | |
| parent | 4164a11032b64fe5a557515f283fa0e4c6d0260d (diff) | |
| download | Qt-95639d8f27300533419da0c8dd22c0cc5e63543e.zip Qt-95639d8f27300533419da0c8dd22c0cc5e63543e.tar.gz Qt-95639d8f27300533419da0c8dd22c0cc5e63543e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml index 69114af..dc29f15 100644 --- a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml +++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml @@ -1,6 +1,6 @@ import Qt 4.6 QtObject { - id: Blah + id: blah } |