diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-16 14:28:33 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-16 14:28:33 (GMT) |
| commit | bc2a71b317724840c695b39f523ca510c28d15e5 (patch) | |
| tree | e845e8982c04bb52fa5c34308dbf0adabb695e60 /src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp | |
| parent | 2a2aa1b0581911de907f7b950b5cf4acda914170 (diff) | |
| parent | d728575ede4fdf3873de71e7cd9a852b9fed4e40 (diff) | |
| download | Qt-bc2a71b317724840c695b39f523ca510c28d15e5.zip Qt-bc2a71b317724840c695b39f523ca510c28d15e5.tar.gz Qt-bc2a71b317724840c695b39f523ca510c28d15e5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
doc/src/declarative/elements.qdoc
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index a489b5a..764676a 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -128,6 +128,7 @@ public: /*! \qmlclass VisualItemModel QDeclarativeVisualItemModel + \ingroup qml-working-with-data \since 4.7 \brief The VisualItemModel allows items to be provided to a view. @@ -644,6 +645,7 @@ QDeclarativeVisualDataModelData *QDeclarativeVisualDataModelPrivate::data(QObjec /*! \qmlclass VisualDataModel QDeclarativeVisualDataModel + \ingroup qml-working-with-data \brief The VisualDataModel encapsulates a model and delegate A VisualDataModel encapsulates a model and the delegate that will |