diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-07-02 17:21:45 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-04 05:20:23 +0200 |
| commit | ece79ecd0ae553ec66bb40a61c00507e466bc5e6 (patch) | |
| tree | 3696d52a8f5194e757c76deacce4b83ee7805103 /src/qml/doc/src/cppintegration | |
| parent | a1ea8f59e650c6be3e14274b36b1197245e96067 (diff) | |
Fix qmlRegisterModuleApi function linkage
The qdoc tag for the \fn doc was incorrect, leading to linkage errors.
Task-number: QTBUG-26236
Change-Id: Ifd407915d9a1461bb2b48a6bf54bb085425ba76b
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration')
| -rw-r--r-- | src/qml/doc/src/cppintegration/functions.qdoc | 5 | ||||
| -rw-r--r-- | src/qml/doc/src/cppintegration/registercpptypes.qdoc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/doc/src/cppintegration/functions.qdoc b/src/qml/doc/src/cppintegration/functions.qdoc index 10a943434e..d32dd7722f 100644 --- a/src/qml/doc/src/cppintegration/functions.qdoc +++ b/src/qml/doc/src/cppintegration/functions.qdoc @@ -200,8 +200,9 @@ QML is by registering a QObject module API. This allows functionality and data to be exposed in a namespace which is accessible from QML. See the documentation about \l{Defining QML Object Types from C++#Module-API-Type-Registration} -for information about module APIs, and see the \l{qmlRegisterModuleApi<T>()} -documentation for details on how to register and use a module API. +{Module API type registration} for information about module APIs, +and see the \l{qmlRegisterModuleApi()} documentation for details on how to +register and use a module API. A module API is instantiated and owned by the engine as a singleton. Thus, it is more performant to implement common functionality in a module diff --git a/src/qml/doc/src/cppintegration/registercpptypes.qdoc b/src/qml/doc/src/cppintegration/registercpptypes.qdoc index 5020b68033..fc11cfc915 100644 --- a/src/qml/doc/src/cppintegration/registercpptypes.qdoc +++ b/src/qml/doc/src/cppintegration/registercpptypes.qdoc @@ -225,7 +225,7 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c A QJSValue may also be exposed as a module API, however clients should be aware that properties of such a module API cannot be bound to. - See \l{qmlRegisterModuleApi<T>()} for more information on how implement and + See \l{qmlRegisterModuleApi()} for more information on how implement and register a new module API, and how to use an existing module API. \section1 Type Revisions and Versions |