diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-08-03 16:55:25 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 02:32:17 +0200 |
| commit | c0c5890b3f9cce4f4d75903677095e8d7da8026c (patch) | |
| tree | ae2cc7f9ec08a2c2cfff580287c4700a18dfd96e /src/qml/doc/src/cppintegration/exposecppattributes.qdoc | |
| parent | 0cefbff3b471e0045788cb3a5af17c57852e46e7 (diff) | |
Restore QML/C++ extensions tutorial and fix plugin docs and examples
This restores the "Writing QML Extensions with C++" tutorial that
was removed during the recent QML doc restructure.
This also updates outdated docs in "Creating C++ Plugins for QML"
that referred to the use of Q_EXPORT_PLUGIN2() and such as the
process for writing QML plugins in Qt 5 has changed.
Note the plugins.json line was removed from
examples/qml/cppextensions/plugins/plugins.pro since this json file
was removed in a previous commit, as plugins no longer require the
empty json file.
Change-Id: I795d6faf6a741466a952feb8e15b028ec3d52b69
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration/exposecppattributes.qdoc')
| -rw-r--r-- | src/qml/doc/src/cppintegration/exposecppattributes.qdoc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc index f4bdb92949..1f2649f98e 100644 --- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc +++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc @@ -58,6 +58,9 @@ used in a way that requires the engine to access additional type information property, or if one of its enum types is to be used in this way — then the class may need to be registered. +(Note that a number of the important concepts covered in this document are +demonstrated in the \l{Writing QML Extensions with C++} tutorial.) + \section1 Properties |