diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-12 00:13:45 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-12 00:13:45 (GMT) |
| commit | 20b9cfdfa2147627dc3ca5cf514402d08ff8d832 (patch) | |
| tree | 0439a339f968983c4308e589759bb9cf925a944b | |
| parent | 98bb02c3210f29dfdc5fb0d82442779fa09dec94 (diff) | |
| parent | aa01490d56c8002a3b782b9016ba6eecefd1ef35 (diff) | |
| download | Qt-20b9cfdfa2147627dc3ca5cf514402d08ff8d832.zip Qt-20b9cfdfa2147627dc3ca5cf514402d08ff8d832.tar.gz Qt-20b9cfdfa2147627dc3ca5cf514402d08ff8d832.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsgridview.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicslistview.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicspathview.cpp | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp index 0ba1491..2fad3bb 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp @@ -874,6 +874,9 @@ void QmlGraphicsGridView::setModel(const QVariant &model) The index is exposed as an accessible \c index property. Properties of the model are also available depending upon the type of \l {qmlmodels}{Data Model}. + Note that the GridView will layout the items based on the size of the root item + in the delegate. + Here is an example delegate: \snippet doc/src/snippets/declarative/gridview/gridview.qml 0 */ diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp index 6460a69..3a59c6c 100644 --- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp @@ -1554,6 +1554,9 @@ void QmlGraphicsListView::setModel(const QVariant &model) The index is exposed as an accessible \c index property. Properties of the model are also available depending upon the type of \l {qmlmodels}{Data Model}. + Note that the ListView will layout the items based on the size of the root item + in the delegate. + Here is an example delegate: \snippet doc/src/snippets/declarative/listview/listview.qml 0 */ diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp index b9c9e05..8ac57e0 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp @@ -302,6 +302,9 @@ void QmlGraphicsPathView::setDragMargin(qreal dragMargin) The index is exposed as an accessible \c index property. Properties of the model are also available depending upon the type of \l {qmlmodels}{Data Model}. + Note that the PathView will layout the items based on the size of the root + item in the delegate. + Here is an example delegate: \snippet doc/src/snippets/declarative/pathview/pathview.qml 1 */ |