diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-06 22:34:51 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-06 22:34:51 (GMT) |
| commit | b74fccf11304c7bfec4f31e01f130de06e42027e (patch) | |
| tree | c20181f0e0e2bc0e5ef9a1273cf5b112a9584d60 /src/declarative/graphicsitems/qdeclarativegridview.cpp | |
| parent | bf965a3b74a10636a63f72d72ad41e169a9851e3 (diff) | |
| parent | 4697a2b50df7135e1da0917676652bcc12abab2a (diff) | |
| download | Qt-b74fccf11304c7bfec4f31e01f130de06e42027e.zip Qt-b74fccf11304c7bfec4f31e01f130de06e42027e.tar.gz Qt-b74fccf11304c7bfec4f31e01f130de06e42027e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativegridview.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativegridview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 75b9d3c..7b413fb 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -1056,7 +1056,7 @@ void QDeclarativeGridView::setModel(const QVariant &model) } /*! - \qmlproperty component GridView::delegate + \qmlproperty Component GridView::delegate The delegate provides a template defining each item instantiated by the view. The index is exposed as an accessible \c index property. Properties of the @@ -1174,7 +1174,7 @@ int QDeclarativeGridView::count() const } /*! - \qmlproperty component GridView::highlight + \qmlproperty Component GridView::highlight This property holds the component to use as the highlight. An instance of the highlight component will be created for each view. |