summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-08-11 13:32:28 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-08-11 13:32:28 (GMT)
commita4d19eef86b07d670b8b2a3f9ad6b3448800bae5 (patch)
tree75e657f20b1ceaea74a293cffec3ccd75118411a
parent41a982bec324894e8a71d68a44f99b0a0d220a34 (diff)
downloadQt-a4d19eef86b07d670b8b2a3f9ad6b3448800bae5.zip
Qt-a4d19eef86b07d670b8b2a3f9ad6b3448800bae5.tar.gz
Qt-a4d19eef86b07d670b8b2a3f9ad6b3448800bae5.tar.bz2
doc: The QML Qt element was missing from the documentation.
Either someone removed the QML: prefix, or it was never there.
-rw-r--r--doc/src/declarative/elements.qdoc1
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp7
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 3822373..de79e4d 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.