diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-05 03:37:14 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-05 03:37:14 (GMT) |
commit | c7ac041e5180d118e300a050d9c579467230a48c (patch) | |
tree | 396f19b89df7a8da97f459385f4f5ceff58ccede /tests/auto/declarative/qdeclarativepathview/data/pathview2.qml | |
parent | 9b7e3943b0e67af48fdbb993c5c4cc93dac81304 (diff) | |
parent | a2e7ab8926c5e8a4c89bb017bbcacfcfbf43ef25 (diff) | |
download | Qt-c7ac041e5180d118e300a050d9c579467230a48c.zip Qt-c7ac041e5180d118e300a050d9c579467230a48c.tar.gz Qt-c7ac041e5180d118e300a050d9c579467230a48c.tar.bz2 |
Merge remote branch 'staging/4.7' into bearermanagement/polling
Diffstat (limited to 'tests/auto/declarative/qdeclarativepathview/data/pathview2.qml')
-rw-r--r-- | tests/auto/declarative/qdeclarativepathview/data/pathview2.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml index 0d5c98b..c825292 100644 --- a/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml +++ b/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml @@ -1,7 +1,7 @@ import Qt 4.6 PathView { - id: photoPathView; model: rssModel; delegate: photoDelegate + id: photoPathView y: 100; width: 800; height: 330; pathItemCount: 10; z: 1 path: Path { |