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/qml/qqml.h | |
| 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/qml/qqml.h')
| -rw-r--r-- | src/qml/qml/qqml.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 528f8e6416..a10ed0c5e8 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -433,33 +433,33 @@ QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) Q_QML_EXPORT void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor); -inline int qmlRegisterModuleApi(const char *uri, int versionMajor, int versionMinor, +inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versionMinor, const char *typeName, QJSValue (*callback)(QQmlEngine *, QJSEngine *)) { - QQmlPrivate::RegisterModuleApi api = { + QQmlPrivate::RegisterSingletonType api = { 0, - uri, versionMajor, versionMinor, + uri, versionMajor, versionMinor, typeName, callback, 0, 0 }; - return QQmlPrivate::qmlregister(QQmlPrivate::ModuleApiRegistration, &api); + return QQmlPrivate::qmlregister(QQmlPrivate::SingletonRegistration, &api); } template <typename T> -inline int qmlRegisterModuleApi(const char *uri, int versionMajor, int versionMinor, +inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versionMinor, const char *typeName, QObject *(*callback)(QQmlEngine *, QJSEngine *)) { - QQmlPrivate::RegisterModuleApi api = { + QQmlPrivate::RegisterSingletonType api = { 1, - uri, versionMajor, versionMinor, + uri, versionMajor, versionMinor, typeName, 0, callback, &T::staticMetaObject }; - return QQmlPrivate::qmlregister(QQmlPrivate::ModuleApiRegistration, &api); + return QQmlPrivate::qmlregister(QQmlPrivate::SingletonRegistration, &api); } QT_END_NAMESPACE |