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, 1 insertions, 7 deletions

diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index c053b14237..5ee27d4457 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -1174,13 +1174,7 @@ bool QQmlImportsPrivate::importExtension(const QString &qmldirFilePath,
     if (qmldirPluginCount == 0)
         return true;
 
-    if (database->qmlDirFilesForWhichPluginsHaveBeenLoaded.contains(qmldirFilePath)) {
-        if ((version.hasMajorVersion() && version.hasMinorVersion())
-                ? !QQmlMetaType::isModule(uri, version)
-                : !QQmlMetaType::isAnyModule(uri)) {
-            QQmlMetaType::qmlRegisterModuleTypes(uri, version);
-        }
-    } else {
+    if (!database->qmlDirFilesForWhichPluginsHaveBeenLoaded.contains(qmldirFilePath)) {
         // First search for listed qmldir plugins dynamically. If we cannot resolve them all, we continue
         // searching static plugins that has correct metadata uri. Note that since we only know the uri
         // for a static plugin, and not the filename, we cannot know which static plugin belongs to which