aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/cppintegration/definetypes.qdoc
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-08-03 16:55:25 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-07 02:32:17 +0200
commitc0c5890b3f9cce4f4d75903677095e8d7da8026c (patch)
treeae2cc7f9ec08a2c2cfff580287c4700a18dfd96e /src/qml/doc/src/cppintegration/definetypes.qdoc
parent0cefbff3b471e0045788cb3a5af17c57852e46e7 (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/definetypes.qdoc')
-rw-r--r--src/qml/doc/src/cppintegration/definetypes.qdoc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc
index 969261a972..3ecd1de442 100644
--- a/src/qml/doc/src/cppintegration/definetypes.qdoc
+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc
@@ -43,6 +43,9 @@ from QML.
Additionally, the QtQml module provides mechanisms for implementing QML-specific
features such as \e{attached properties} and \e{default properties} in C++.
+(Note that a number of the important concepts covered in this document are
+demonstrated in the \l{Writing QML Extensions with C++} tutorial.)
+
\section1 Registering C++ types with the QML type system
@@ -633,7 +636,10 @@ QtQuick C++ module. Therefore, this class should be subclassed when it is
necessary to implement a visual type in C++ that can be integrated into a
QML-based user interface.
-See the QQuickItem documentation for more information.
+See the QQuickItem documentation for more information. Additionally, the
+\l{Writing QML Extensions with C++} tutorial demonstrates how a QQuickItem-based
+visual item can be implemented in C++ and integrated into a QtQuick-based user
+interface.
\section1 Receiving Notifications for Object Initialization