aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-07-23 14:34:35 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-25 10:52:44 +0200
commit4ec4ce407cf2c55811ff3876b49254785761e2dd (patch)
tree9ae65057c796bad66b9b68308bd0fe3f3656c9e1 /src
parent7fddd1c5696bb8043bc7df7df2ba233ce65c1254 (diff)
Doc: Modified the term for the Qt global object.
QtQml::Qt is a "QML global object" to differentiate it from the Qt namespace. "QML Qt object" "QML Qt global object" "Qt global object" (in the context of QML-only pages) Change-Id: I1d2896ad48e8432c5eb8b18f05af247986bff336 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/qml/qqmlengine.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 5a7a9f1928..fef3dd21fe 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -278,11 +278,8 @@ QQmlImageProviderBase::~QQmlImageProviderBase()
\inqmlmodule QtQml 2
\instantiates QQmlEnginePrivate
\ingroup qml-utility-elements
-\brief The QML global Qt object provides useful enums and functions from Qt.
-
\keyword QmlGlobalQtObject
-
-\brief The \c Qt object provides useful enums and functions from Qt, for use in all QML files.
+\brief Provides a global object with useful enums and functions from Qt.
The \c Qt object is a global object with utility functions, properties and enums.