diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-17 07:11:26 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-17 07:12:23 +0100 |
| commit | f596553e03c3969f6e7cb5344c05591da6e70dfb (patch) | |
| tree | 8aef667749e1adc015cbc9c5ec5b5af9c6d4c15c /src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc | |
| parent | e32845b137834ef46d68345a0029d4af7c1d85bb (diff) | |
| parent | 7030adff1869e850a7b983e88d7a773d5d594886 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/imports/dialogs/DefaultFileDialog.qml
src/imports/widgets/qquickqfiledialog.cpp
Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd
Diffstat (limited to 'src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc')
| -rw-r--r-- | src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc index abef6b765b..f1e13e127c 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc @@ -110,20 +110,7 @@ by the other approaches. A QAbstractItemModel can also automatically notify a QML view when the model data changes. The roles of a QAbstractItemModel subclass can be exposed to QML by -reimplementing QAbstractItemModel::roleNames(). The default role names -set by Qt are: - -\table -\header -\li Qt Role -\li QML Role Name -\row -\li Qt::DisplayRole -\li display -\row -\li Qt::DecorationRole -\li decoration -\endtable +reimplementing QAbstractItemModel::roleNames(). Here is an application with a QAbstractListModel subclass named \c AnimalModel, which exposes the \e type and \e sizes roles. It reimplements |