diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-04-30 07:09:47 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-04-30 07:09:47 (GMT) |
| commit | 3b79fb99c9fdf4f80fa0ca2168f421b3489aebc8 (patch) | |
| tree | 5fd9c2ce72b1bae898ca37843069c3746e4172dd /src/declarative/fx/qfxpathview.cpp | |
| parent | c50f26a26f1e7ac22bd3ff08fe24a927c57e127b (diff) | |
| parent | 0e664dabc5b7325634e54d120eb374940497ca0f (diff) | |
| download | Qt-3b79fb99c9fdf4f80fa0ca2168f421b3489aebc8.zip Qt-3b79fb99c9fdf4f80fa0ca2168f421b3489aebc8.tar.gz Qt-3b79fb99c9fdf4f80fa0ca2168f421b3489aebc8.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxpathview.cpp
Diffstat (limited to 'src/declarative/fx/qfxpathview.cpp')
| -rw-r--r-- | src/declarative/fx/qfxpathview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp index 5c24d86..a2ea8ee 100644 --- a/src/declarative/fx/qfxpathview.cpp +++ b/src/declarative/fx/qfxpathview.cpp @@ -99,7 +99,7 @@ private: \brief The PathView element lays out model-provided items on a path. \inherits Item - The model is typically provided by a QAbstractListModel "C++ model object", but can also be created directly in XML. + The model is typically provided by a QAbstractListModel "C++ model object", but can also be created directly in QML. The items are laid out along a path defined by a \l Path and may be flicked to scroll. @@ -140,6 +140,7 @@ QFxPathView::~QFxPathView() The model provides a set of data that is used to create the items for the view. For large or dynamic datasets the model is usually provided by a C++ model object. + Models can also be created directly in XML, using the ListModel element. */ /*! |