diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 02:08:17 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 02:08:17 (GMT) |
commit | 5b2d90a57c3722aa48edeaa58be2d55ae967a99d (patch) | |
tree | c0602cea4552854b38169a519ee3222e047839fb /tests/auto/declarative/qdeclarativepathview/data/pathview3.qml | |
parent | b2b9dc03fc01a8387e74591642fa15b272845e2b (diff) | |
parent | b3c94b923200dd9c98b66f4233c62e63a3ee79d4 (diff) | |
download | Qt-5b2d90a57c3722aa48edeaa58be2d55ae967a99d.zip Qt-5b2d90a57c3722aa48edeaa58be2d55ae967a99d.tar.gz Qt-5b2d90a57c3722aa48edeaa58be2d55ae967a99d.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:
Add docs and tests for WorkerListModel.
Add accessor operations to VisualItemModel::children
Make "on" syntax mandatory for value sources and interceptors
Fix warning.
Minor optimization.
Test GridView.onAdd & GridView.onRemove. Reduce wait()s
Replace remaining QGuard usage with QDeclarativeGuard.
Reapply "Some animation cleanup/refactoring."
Setting the same source again causes reload.
Expand documention of status property with examples
Document TextEdit::textMargin
use ParentAnimation
Diffstat (limited to 'tests/auto/declarative/qdeclarativepathview/data/pathview3.qml')
-rw-r--r-- | tests/auto/declarative/qdeclarativepathview/data/pathview3.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml index 412cca2..af3ae13 100644 --- a/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml +++ b/tests/auto/declarative/qdeclarativepathview/data/pathview3.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: 4; offset: 10 dragMargin: 24; snapPosition: 50 |