diff options
author | Chris Adams <christopher.adams@nokia.com> | 2012-07-10 16:52:53 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 06:47:57 +0200 |
commit | fc56909bbd7444ae6536bed0ddab21f64e0949e7 (patch) | |
tree | 8ec6c6b403d5d79c51a2688bfec6adbcb6c53707 /src/qml/doc/src/cppintegration/topic.qdoc | |
parent | 89cdaa901d227bed35f6c5405ce5d62f352a659c (diff) |
Improve QtQml module documentation
General improvements, including:
- fixing broken links
- improving topic page content
- fixing incorrect qdoc commands
Change-Id: I50b6733b51cdabf9cecd96046f6e7f41260a9a4b
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration/topic.qdoc')
-rw-r--r-- | src/qml/doc/src/cppintegration/topic.qdoc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/doc/src/cppintegration/topic.qdoc b/src/qml/doc/src/cppintegration/topic.qdoc index 1a53345e93..1fd0cd7df4 100644 --- a/src/qml/doc/src/cppintegration/topic.qdoc +++ b/src/qml/doc/src/cppintegration/topic.qdoc @@ -48,22 +48,20 @@ You may want to mix QML and C++ for a number of reasons. For example: calling functions in a third-party C++ library) \li To access functionality in the QtQml or QtQuick modules (for example, to dynamically generate images using QQuickImageProvider) -\li To write your own QML elements (whether for your applications, or for distribution to others) +\li To write your own QML object types (whether for your applications, or for distribution to others) \endlist - There are a number of ways to extend your QML application through C++. For example, you could: \list \li Load a QML component and manipulate it (or its children) from C++ \li Embed a C++ object and its properties directly into a QML component (for example, to make a particular C++ object callable from QML, or to replace a dummy list model with a real data set) -\li Define new QML elements (through QObject-based C++ classes) and create them directly from your +\li Define new QML object types (through QObject-based C++ classes) and create them directly from your QML code \endlist - \section1 Exposing C++ Types To QML QML types may be implemented in C++ and then exposed to the QML type system via |