diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-04 11:28:14 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-04 11:28:14 (GMT) |
| commit | ce0fc2ebeaf195368c31b143a40850f01ada450a (patch) | |
| tree | 3c46a405766b4ec5a5676fca15df5d4e13ca2342 /doc/src/declarative/qdeclarativemodels.qdoc | |
| parent | 39e7c4de155a150a0e7da6e40f59aadecaea0a8a (diff) | |
| parent | 74ad5ce57adedc91717ffd67e3e65b8f76d12052 (diff) | |
| download | Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.zip Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.tar.gz Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/declarative/extending.qdoc
doc/src/external-resources.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativetransition.cpp
Diffstat (limited to 'doc/src/declarative/qdeclarativemodels.qdoc')
| -rw-r--r-- | doc/src/declarative/qdeclarativemodels.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc index 6ff2748..7d89056 100644 --- a/doc/src/declarative/qdeclarativemodels.qdoc +++ b/doc/src/declarative/qdeclarativemodels.qdoc @@ -286,7 +286,7 @@ with models of type QAbstractItemModel: \endlist -\section2 Exposing C++ data models to QML +\section2 Exposing C++ Data Models to QML The above examples use QDeclarativeContext::setContextProperty() to set model values directly in QML components. An alternative to this is to @@ -318,7 +318,9 @@ MyModel { id: myModel ListElement { someProperty: "some value" } } +\endqml +\qml ListView { width: 200; height: 250 model: myModel |