diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-09 04:59:30 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-09 04:59:30 (GMT) |
| commit | 60e0a0b0fb6a2cf7b9fffd4ff2d30838ffa4ac84 (patch) | |
| tree | f4e5307c96e51273d1c2b9b85b71759b9a23f122 /tests/auto/declarative/qdeclarativegridview | |
| parent | 10620af6eb644e76b762c9f834436bebbb80058f (diff) | |
| parent | efc80769f3274d31e06308717d06a70a4249cced (diff) | |
| download | Qt-60e0a0b0fb6a2cf7b9fffd4ff2d30838ffa4ac84.zip Qt-60e0a0b0fb6a2cf7b9fffd4ff2d30838ffa4ac84.tar.gz Qt-60e0a0b0fb6a2cf7b9fffd4ff2d30838ffa4ac84.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativegridview')
| -rw-r--r-- | tests/auto/declarative/qdeclarativegridview/data/gridview1.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml index ba6b807..a061ae2 100644 --- a/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml +++ b/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml @@ -3,7 +3,7 @@ import Qt 4.6 Rectangle { id: root property int added: -1 - property var removed + property variant removed width: 240 height: 320 |