diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:42:21 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:42:21 +0200 |
| commit | 1d3b9db5b54d8ae99c6b149c8d3d91eda19b5838 (patch) | |
| tree | 9ffbf9d6d2ed6b0aef6155215767c56655ff405b /src/qml/qml/qqmlengine.cpp | |
| parent | 45792359f25813af18b7416e4c18737ed4b20bff (diff) | |
| parent | 0316506d9ddbc3ca9f26f880b9e7fb5d5b0fec36 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I06f79bcbde13c7b12905492a17dbcbb4a594e557
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 1c491ae492..cc780d57b9 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. |