diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-07-23 17:45:40 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-25 09:31:57 +0200 |
| commit | 28def0bdd084989c17a157e0c4ab80c259081caa (patch) | |
| tree | 5197bc3e89aff301d367738aa868cb226dc65fd7 /src/qml/doc/src/typesystem | |
| parent | 14985d7b4347ed422358f963ae184f4dcb22f66f (diff) | |
Revise the restructured "Integrating QML and C++" docs
These docs were yet to be cleaned up following the recent doc
restructure. This changes most of the the content in these sections
and includes some new docs and examples.
Currently all the code snippets are included inline. In a later patch,
these should be moved into the snippets/ directories and be included
using the \snippet command instead. Alternatively they can be moved
into examples/ to replace the BirthdayParty examples which are no
longer referenced in these docs as of this patch.
Task-number: QTBUG-26381
Change-Id: I94e3654e61476fad11fe81042d1bbe94fc649d06
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/doc/src/typesystem')
| -rw-r--r-- | src/qml/doc/src/typesystem/objecttypes.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/src/typesystem/objecttypes.qdoc b/src/qml/doc/src/typesystem/objecttypes.qdoc index f2715b30cc..9d8f636f16 100644 --- a/src/qml/doc/src/typesystem/objecttypes.qdoc +++ b/src/qml/doc/src/typesystem/objecttypes.qdoc @@ -44,7 +44,7 @@ Custom QML object types can be defined by creating a .qml file that defines the type, as discussed in \l {qtqml-documents-definetypes.html} {Documents as QML object type definitions}, or by defining a QML type from C++ and registering the type with the QML engine, as discussed in -\l{qtqml-registercpptypes.html}{Registering C++ Types with the QML Type System}. +\l{qtqml-cppintegration-definetypes.html}{Defining QML Types from C++}. \section1 Creating Object Types from QML @@ -130,7 +130,7 @@ functions which each allow different use-cases to be fulfilled. \endlist For more information on this topic, see the documentation regarding -\l{qtqml-cppintegration-registercpptypes.html}{Creating QML Object Types from C++}. +\l{qtqml-cppintegration-definetypes.html}{Defining QML Types from C++}. The QML type-system relies on imports, plugins and extensions being installed into a known import path. Plugins may be provided by third-party developers |