diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-04-28 09:49:37 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-04-28 09:49:37 (GMT) |
| commit | e393f03cb89c795e4a638f84b002cb16fd1613a7 (patch) | |
| tree | 1f9272e1dcf9f162682e9c3571ffb0e6aded1618 /tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml | |
| parent | 1f00130097f81bc78aebb3c055f38c066221bc98 (diff) | |
| parent | 3eded761167af317bab4f4d8c1ac0a12433eb03a (diff) | |
| download | Qt-e393f03cb89c795e4a638f84b002cb16fd1613a7.zip Qt-e393f03cb89c795e4a638f84b002cb16fd1613a7.tar.gz Qt-e393f03cb89c795e4a638f84b002cb16fd1613a7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml index 548e498..30e8274 100644 --- a/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml +++ b/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 QtObject { property variant nested |