diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-18 12:23:30 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-21 14:31:02 +0200 |
| commit | 71085008cecc25b9f635ed3c811f296a15ec0c0d (patch) | |
| tree | e739d5d1732079bc5ff6cd19245d15a68b1a2fce /src/qml/qml/qqml.h | |
| parent | 21c13ab37426f96ab7717cc7b2764b702b382343 (diff) | |
Allow extending namespaces with other namespaces
Previously you could only extend types.
Change-Id: I5d0bcea58403a87b9ff878c255ff590f162f8b24
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqml.h')
| -rw-r--r-- | src/qml/qml/qqml.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index d82567d26e..b635c2289e 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -790,8 +790,9 @@ inline void qmlRegisterTypesAndRevisions<>(const char *, int, QList<int> *) inline void qmlRegisterNamespaceAndRevisions(const QMetaObject *metaObject, const char *uri, int versionMajor, - QList<int> *qmlTypeIds = nullptr, - const QMetaObject *classInfoMetaObject = nullptr) + QList<int> *qmlTypeIds, + const QMetaObject *classInfoMetaObject, + const QMetaObject *extensionMetaObject) { QQmlPrivate::RegisterTypeAndRevisions type = { 0, @@ -816,7 +817,7 @@ inline void qmlRegisterNamespaceAndRevisions(const QMetaObject *metaObject, -1, nullptr, - nullptr, + extensionMetaObject, &qmlCreateCustomParser<void>, qmlTypeIds @@ -825,6 +826,15 @@ inline void qmlRegisterNamespaceAndRevisions(const QMetaObject *metaObject, qmlregister(QQmlPrivate::TypeAndRevisionsRegistration, &type); } +inline void qmlRegisterNamespaceAndRevisions(const QMetaObject *metaObject, + const char *uri, int versionMajor, + QList<int> *qmlTypeIds = nullptr, + const QMetaObject *classInfoMetaObject = nullptr) +{ + qmlRegisterNamespaceAndRevisions(metaObject, uri, versionMajor, qmlTypeIds, + classInfoMetaObject, nullptr); +} + int Q_QML_EXPORT qmlTypeId(const char *uri, int versionMajor, int versionMinor, const char *qmlName); QT_END_NAMESPACE |