diff options
| author | Glenn Watson <glenn.watson@nokia.com> | 2012-07-24 11:41:50 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-08 07:55:19 +0200 |
| commit | 6ebf215fdaf2d757ab90ae4d46c4b938e978e2dc (patch) | |
| tree | 515da352f1cc4d5567b6d93f0b19952b2e27d705 /src/qml/doc/src/cppintegration/topic.qdoc | |
| parent | 92562eacbc3c614a83a734f1108ed7df02415eae (diff) | |
Add type name to singleton (module api) implementations.
This change renames the previous module api implementation
to singleton types.
When a singleton type is registered, a type name must be provided
that is used when accessing the API from QML. This makes the
implementation more consistent with the rest of QML.
Task-number: QTBUG-26549
Change-Id: Iab0bb1ccf516bd3ae20aee562a64d22976e0aecd
Reviewed-by: Chris Adams <christopher.adams@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, 3 insertions, 3 deletions
diff --git a/src/qml/doc/src/cppintegration/topic.qdoc b/src/qml/doc/src/cppintegration/topic.qdoc index 49b1aa0e0c..fc7c626502 100644 --- a/src/qml/doc/src/cppintegration/topic.qdoc +++ b/src/qml/doc/src/cppintegration/topic.qdoc @@ -61,8 +61,8 @@ required functionality is provided by such a class, it can be exposed to QML in registered as an instantiable QML type}, so that it can be instantiated and used like any ordinary \l{qtqml-typesystem-objecttypes.html}{QML object type} from QML code \li The class can be registered as a -\l{qtqml-cppintegration-definetypes.html#registering-singleton-objects-with-a-module-api} -{Module API} so that a single instance of the class may be imported from QML code, allowing the +\l{qtqml-cppintegration-definetypes.html#registering-singleton-objects-with-a-singleton-type} +{Singleton Type} so that a single instance of the class may be imported from QML code, allowing the instance's properties, methods and signals to be accessed from QML \li An instance of the class can be \l{qtqml-cppintegration-contextproperties.html}{embedded into QML code} as a \e {context property} or \e {context object}, allowing the instance's properties, @@ -100,7 +100,7 @@ more information. QML types can be defined in C++ and then registered with the \l{qtqml-typesystem-topic.html}{QML type system}. This allows a C++ class to be instantiated as a \l {QML object type}, enabling custom object types to be implemented in C++ and integrated into existing QML code. A C++ class may be also -registered for other purposes: for example, it could be registered as a \e {Module API} to enable a +registered for other purposes: for example, it could be registered as a \e {Singleton Type} to enable a single class instance to be imported by QML code, or it could be registered to enable the enumeration values of a non-instantiable class to be accessible from QML. |