diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-06 16:07:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-06 18:26:47 +0200 |
| commit | f1b9ba8c6ee6b991ef4e513bc4f39045fd55d1e6 (patch) | |
| tree | cd587156a07344e98aca0cd1511075fe272bfec5 /src/qml/qml/qqmlengine.cpp | |
| parent | 27deff6d2b5a9eb1d98cd7b377ab934a35086664 (diff) | |
| parent | 1d3b9db5b54d8ae99c6b149c8d3d91eda19b5838 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index dbf098e701..a2a40c592d 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. |