diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 05:55:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 05:55:55 (GMT) |
| commit | 773512d205df2ba7caa28b7b5cdbfbd6787a0967 (patch) | |
| tree | b43ac88fa0adc5655f05d665cdd9b95794cbdb00 /doc/src/declarative | |
| parent | c68fc875a4f824686b1a55f5eb810ad72922e58a (diff) | |
| parent | f77cd44a51c36e661c28e5b65ca4e17445bdffa5 (diff) | |
| download | Qt-773512d205df2ba7caa28b7b5cdbfbd6787a0967.zip Qt-773512d205df2ba7caa28b7b5cdbfbd6787a0967.tar.gz Qt-773512d205df2ba7caa28b7b5cdbfbd6787a0967.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
update Russian translations for Qt and tools
Updated Slovenian translations for Qt 4.7
doc: The QML Qt element was missing from the documentation.
64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256
QXmlStreamReader: avoid unnecessary detaching
QSslCertificate: support expiration dates > 2049
Doc: Fixing typo
Doc: Fixing bug involving header misplacement in Creator style
qdoc: Added list of all members (including inherited) page to QML elements.
qdoc: Ensured that text is encoded correctly.
qdoc: Fixed non-well-formed markup.
Doc: Fixed typo in a shortcut string.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Doc: Added more license information.
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 c2930b3..c008404 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}{Qt \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 |