diff options
author | Martin Smith <martin.smith@nokia.com> | 2010-08-11 13:32:28 (GMT) |
---|---|---|
committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-12 08:52:08 (GMT) |
commit | 1a378511576b32ec26dcbd85b66a94e366422d61 (patch) | |
tree | 924d72b9d8691e10ca5238f826dfa87f77b70853 | |
parent | 6419a9c35e2ee1305b7f9cfe9213a152aafeb2e5 (diff) | |
download | Qt-1a378511576b32ec26dcbd85b66a94e366422d61.zip Qt-1a378511576b32ec26dcbd85b66a94e366422d61.tar.gz Qt-1a378511576b32ec26dcbd85b66a94e366422d61.tar.bz2 |
doc: The QML Qt element was missing from the documentation.
Either someone removed the QML: prefix, or it was never there.
(cherry picked from commit a4d19eef86b07d670b8b2a3f9ad6b3448800bae5)
-rw-r--r-- | doc/src/declarative/elements.qdoc | 1 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 7 |
2 files changed, 5 insertions, 3 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 diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index b2f3cd1..1b58804 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -184,11 +184,12 @@ void QDeclarativeEnginePrivate::defineModule() } /*! -\keyword QmlGlobalQtObject -\qmlclass Qt QDeclarativeEnginePrivate +\qmlclass QML:Qt QDeclarativeEnginePrivate \brief The QML global Qt object provides useful enums and functions from Qt. -The \c Qt object provides useful enums and functions from Qt, for use in all QML files. +\keyword QmlGlobalQtObject + +\brief The \c Qt object provides useful enums and functions from Qt, for use in all QML files. The \c Qt object is not a QML element; it cannot be instantiated. It is a global object with enums and functions. To use it, call the members of the global \c Qt object directly. |