From: Jerome Pasion Date: Tue, 23 Jul 2013 12:34:35 +0000 (+0200) Subject: Doc: Modified the term for the Qt global object. X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4ec4ce407cf2c55811ff3876b49254785761e2dd;p=konrad%2Fqtdeclarative.git 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ö Reviewed-by: Laszlo Papp Reviewed-by: Alan Alpert --- diff --git a/examples/quick/text/doc/src/text.qdoc b/examples/quick/text/doc/src/text.qdoc index c93d2db..3a300fb 100644 --- a/examples/quick/text/doc/src/text.qdoc +++ b/examples/quick/text/doc/src/text.qdoc @@ -50,7 +50,7 @@ or finally using a FontLoader and specifying a remote font file: \snippet text/fonts/fonts.qml fontloaderremote - 'Available Fonts' shows how to use the QML global Qt object and a list view + 'Available Fonts' shows how to use the QML \l{QtQml::Qt}{Qt} global object and a list view to display all the fonts available on the system. The ListView type uses the list of fonts available as its model: \snippet text/fonts/availableFonts.qml model diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 5a7a9f1..fef3dd2 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.