diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:43:26 +0200 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:56:14 +0200 |
commit | 24fb8dc27eddfdd62bd2c3a6e863cbf433762cd6 (patch) | |
tree | 917eff8c50fe4699547b9de852ee53257c1585cf /doc | |
parent | 3e6a8eca00334df344a45f09afbcf8fd8e2b7c54 (diff) | |
parent | ffdbf216dc80b3d781307bb6b4b7150281c874a3 (diff) |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlpropertycache.cpp
src/quick/util/qquickimageprovider.cpp
Change-Id: I0609aa5ed54c7769f1e2773a96a7cd43a69f133c
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/qml/qtdeclarative.qdoc | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/doc/src/qml/qtdeclarative.qdoc b/doc/src/qml/qtdeclarative.qdoc index 20d1c40d66..48cc898458 100644 --- a/doc/src/qml/qtdeclarative.qdoc +++ b/doc/src/qml/qtdeclarative.qdoc @@ -27,10 +27,10 @@ /*! \module QtQml - \title Qt Declarative Module + \title Qt Qml Module \ingroup modules - \brief The Qt Declarative module provides a declarative framework + \brief The Qt Qml module provides a declarative framework for building highly dynamic, custom user interfaces. To include the definitions of the module's classes, use the @@ -44,10 +44,11 @@ .pro file: \code - QT += declarative + QT += qml \endcode - For more information on the Qt Declarative module, see the + For more information on the Qt Qml module (including the visual + elements which are implemented on top of the Qt Qml module) see the \l{Qt Quick} documentation. */ @@ -278,7 +279,16 @@ */ /*! + \internal \fn int qmlRegisterModuleApi(const char *uri, int versionMajor, int versionMinor, QObject *(*callback)(QQmlEngine *, QJSEngine *)) + \deprecated + + Any uses of a module API in a binding where that module API was registered with this + function instead of the template version will result in suboptimal binding generation. + */ + +/*! + \fn template<typename T> int qmlRegisterModuleApi(const char *uri, int versionMajor, int versionMinor, QObject *(*callback)(QQmlEngine *, QJSEngine *)) \relates QQmlEngine This function may be used to register a module API provider \a callback in a particular \a uri @@ -289,13 +299,18 @@ A module API may be either a QObject or a QJSValue. Only one module API provider may be registered into any given namespace (combination of \a uri, \a versionMajor and \a versionMinor). - This function should be used to register a module API provider function which returns a QObject as a module API. + This function should be used to register a module API provider function which returns a QObject + of the given type T as a module API. A QObject module API must be imported with a qualifier, and that qualifier may be used as the target in a \l Connections element or otherwise used as any other element id would. One exception to this is that a QObject module API property may not be aliased (because the module API qualifier does not identify an object within the same component as any other item). + \b{NOTE:} A QObject module API instance returned from a module API provider is owned by the QML + engine. For this reason, the module API provider function should \b{not} be implemented as a + singleton factory. + Usage: \code // first, define your QObject which provides the functionality. |