diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-11 14:56:22 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-11 16:05:03 +0200 |
| commit | a896d4b39ec3d45ba708d9b36ea9c864b1df2136 (patch) | |
| tree | 45cfe153cce6114c2c76c48dc0bdabde2a8cf3e3 /doc/src/qml | |
| parent | 24fb8dc27eddfdd62bd2c3a6e863cbf433762cd6 (diff) | |
| parent | 65bfc35429e845cf6b76d58107360a1360a654fc (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/v4/qv4bindings.cpp
src/quick/items/qquickshadereffect.cpp
src/quick/particles/qquickcustomparticle.cpp
src/quick/qtquick2.cpp
Change-Id: Ia9c6517035ae912fa75e77473a452bd3383def56
Diffstat (limited to 'doc/src/qml')
| -rw-r--r-- | doc/src/qml/qmltypes.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/qml/qtdeclarative.qdoc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/qml/qmltypes.qdoc b/doc/src/qml/qmltypes.qdoc index ae4ad47c3d..b75c191616 100644 --- a/doc/src/qml/qmltypes.qdoc +++ b/doc/src/qml/qmltypes.qdoc @@ -70,6 +70,8 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c Alternatively, these functions provide a way for other types of C++ types to be visible in the QML context. \list + \li \l qmlRegisterModuleApi() is suited for registering either a QJSValue + or QObject module API (shared instance) into a namespace \li \l qmlRegisterUncreatableType() is suited for attached properties and enum types. \li \l qmlRegisterTypeNotAvailable() is for diff --git a/doc/src/qml/qtdeclarative.qdoc b/doc/src/qml/qtdeclarative.qdoc index 48cc898458..5ad637ab50 100644 --- a/doc/src/qml/qtdeclarative.qdoc +++ b/doc/src/qml/qtdeclarative.qdoc @@ -351,7 +351,7 @@ // third, register the module API provider with QML by calling this function in an initialization function. ... - qmlRegisterModuleApi("Qt.example.qobjectApi", 1, 0, example_qobject_module_api_provider); + qmlRegisterModuleApi<ModuleApiExample>("Qt.example.qobjectApi", 1, 0, example_qobject_module_api_provider); ... \endcode |