diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-11 19:15:59 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-12 17:42:11 +0100 |
| commit | a2b31f073530f61203fe0e9799ad158c4fe6b9f9 (patch) | |
| tree | 4edd506b2acd258376b187ad4950154421126809 /src/qml/qml/qqmlmetatype.cpp | |
| parent | c70452a65af222343451f19ec62744314444c181 (diff) | |
Add a static variant of qmlRegisterInterface()
qmlRegisterInterface() should not be called procedurally, for the same
reason that qmlRegisterType() should not be called procedurally.
Also, add URI and major version parameters to qmlRegisterInterface(),
and deprecate the typeName parameter. We want to identify which import
an interface belongs to.
Task-number: QTBUG-68796
Change-Id: Iba3d66e5ce6219b30aadba34396f12fca92f35a7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlmetatype.cpp')
| -rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index bff6a8a46f..b2a769cab4 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -92,8 +92,13 @@ static QQmlTypePrivate *createQQmlType(QQmlMetaTypeData *data, d->typeId = type.typeId; d->listId = type.listId; d->isSetup = true; - d->version_maj = 0; d->version_min = 0; + if (type.version > 0) { + d->module = QString::fromUtf8(type.uri); + d->version_maj = type.versionMajor; + } else { + d->version_maj = 0; + } data->registerType(d); return d; } @@ -345,7 +350,7 @@ void QQmlMetaType::unregisterAutoParentFunction(const QQmlPrivate::AutoParentFun QQmlType QQmlMetaType::registerInterface(const QQmlPrivate::RegisterInterface &type) { - if (type.version > 0) + if (type.version > 1) qFatal("qmlRegisterType(): Cannot mix incompatible QML versions."); QQmlMetaTypeDataPtr data; @@ -354,8 +359,6 @@ QQmlType QQmlMetaType::registerInterface(const QQmlPrivate::RegisterInterface &t data->idToType.insert(priv->typeId, priv); data->idToType.insert(priv->listId, priv); - if (!priv->elementName.isEmpty()) - data->nameToType.insert(priv->elementName, priv); if (data->interfaces.size() <= type.typeId) data->interfaces.resize(type.typeId + 16); |