diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-16 15:00:36 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-13 12:48:07 +0100 |
commit | 164e559c8a7a34aa46ef7563a19100f81a1cade4 (patch) | |
tree | 5fcef6001bbc66c4589c852603a27d93f2aa0b09 /src/qml/qml/qqmlmetatype_p.h | |
parent | 4b8699c88bcd129a3fe34155654921ff3d5ffd5d (diff) |
Process major versions as part of Q_REVISION
Retrieve the major version from the meta object revisions and use them
to register types and generate qmltypes files.
Change-Id: I35da8963457660d1a49ba9063574e1a68057a7ba
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
-rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index e98a87e6a9..c68bf0c551 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -198,11 +198,10 @@ public: static void clone(QMetaObjectBuilder &builder, const QMetaObject *mo, const QMetaObject *ignoreStart, const QMetaObject *ignoreEnd); - static void qmlInsertModuleRegistration(const QString &uri, QTypeRevision version, - void (*registerFunction)()); - static void qmlRemoveModuleRegistration(const QString &uri, QTypeRevision version); + static void qmlInsertModuleRegistration(const QString &uri, void (*registerFunction)()); + static void qmlRemoveModuleRegistration(const QString &uri); - static bool qmlRegisterModuleTypes(const QString &uri, QTypeRevision version); + static bool qmlRegisterModuleTypes(const QString &uri); }; Q_DECLARE_TYPEINFO(QQmlMetaType, Q_MOVABLE_TYPE); |