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>

1 files changed, 12 insertions, 9 deletions

diff --git a/src/qml/qml/qqmlmoduleregistration.cpp b/src/qml/qml/qqmlmoduleregistration.cpp
index 01f93b85fe..422a5c0551 100644
--- a/src/qml/qml/qqmlmoduleregistration.cpp
+++ b/src/qml/qml/qqmlmoduleregistration.cpp
@@ -46,23 +46,26 @@ QT_BEGIN_NAMESPACE
 struct QQmlModuleRegistrationPrivate
 {
     const QString uri;
-    const QTypeRevision version;
 };
 
+QQmlModuleRegistration::QQmlModuleRegistration(const char *uri, void (*registerFunction)()) :
+    d(new QQmlModuleRegistrationPrivate { QString::fromUtf8(uri) })
+{
+    QQmlMetaType::qmlInsertModuleRegistration(d->uri, registerFunction);
+}
+
+#if QT_DEPRECATED_SINCE(6, 0)
 QQmlModuleRegistration::QQmlModuleRegistration(
-        const char *uri, int majorVersion,
-        void (*registerFunction)()) :
-    d(new QQmlModuleRegistrationPrivate {
-        QString::fromUtf8(uri),
-        QTypeRevision::fromMajorVersion(majorVersion)
-      })
+        const char *uri, int majorVersion, void (*registerFunction)()) :
+    QQmlModuleRegistration(uri, registerFunction)
 {
-    QQmlMetaType::qmlInsertModuleRegistration(d->uri, d->version, registerFunction);
+    Q_UNUSED(majorVersion);
 }
+#endif
 
 QQmlModuleRegistration::~QQmlModuleRegistration()
 {
-    QQmlMetaType::qmlRemoveModuleRegistration(d->uri, d->version);
+    QQmlMetaType::qmlRemoveModuleRegistration(d->uri);
     delete d;
 }