diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2013-05-14 12:41:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-15 09:32:58 +0200 |
| commit | ebbb0257e65b762ac6c3cf2baa19bbb5d581d071 (patch) | |
| tree | 57f4b9df9881043b34a57e0718c9d28a0e7ba3f7 /src/qml/doc/src/cppclasses/topic.qdoc | |
| parent | 56da72fb219356d2948e9adae3f3a17553fc7add (diff) | |
Doc: Define Qt global object as a QML type and fix referring docs
This change adds the Qt global object as a QML type in the Qt QML module
and fixes links to it in documentation.
Task-number: QTBUG-29353
Change-Id: I1690224091a79a3309fac7a78aa0c0c734449e4f
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/doc/src/cppclasses/topic.qdoc')
| -rw-r--r-- | src/qml/doc/src/cppclasses/topic.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/src/cppclasses/topic.qdoc b/src/qml/doc/src/cppclasses/topic.qdoc index 66a374e811..7c21793cfd 100644 --- a/src/qml/doc/src/cppclasses/topic.qdoc +++ b/src/qml/doc/src/cppclasses/topic.qdoc @@ -88,7 +88,7 @@ properties of a QQmlContext, and how to access the context for an object. Dynamic object instantiation and dynamic expression evaluation are both core concepts in QML. QML documents define object types which can be instantiated at run-time using a QQmlComponent. An instance of the QQmlComponent class can -be created in C++ directly, or via the \l{QML:Qt::createComponent()} +be created in C++ directly, or via the \l{QtQml2::Qt::createComponent()} {Qt.createComponent()} function in imperative QML code. Arbitrary expressions can be calculated in C++ via the QQmlExpression class, and such expressions can interact directly the QML context. |