diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:10:00 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:10:00 (GMT) |
| commit | 9878c1765332d9a68a8371b90888fe09e272c7a8 (patch) | |
| tree | a67a7a28f6737b17498a76bcc40d5ffd65e81572 /doc/src/declarative | |
| parent | 7d805a6717692b540c02b8caace25a0b47c7f0d6 (diff) | |
| parent | b52da4ab2179079a6aff95891786d2f6598048b5 (diff) | |
| download | Qt-9878c1765332d9a68a8371b90888fe09e272c7a8.zip Qt-9878c1765332d9a68a8371b90888fe09e272c7a8.tar.gz Qt-9878c1765332d9a68a8371b90888fe09e272c7a8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
Diffstat (limited to 'doc/src/declarative')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 55b71e1..7a809eb 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -114,6 +114,7 @@ The following table lists the QML elements provided by the \l{QtDeclarative} mod \row \o \l {Component} \o Encapsulate QML items as a component \row \o \l {Timer} \o Provides timed triggers \row \o \l {QML:QtObject} {QtObject} \o Basic element containing only the objectName property +\row \o \l {QML:Qt} {Qt} \o The QML global Qt object provides useful enums and functions from Qt. \row \o \l {WorkerScript} \o Enables the use of threads in QML \row \o \l {Loader} \o Controls the loading of items or components \row \o \l {Repeater} \o Uses a model to create multiples of components |