Fix qmlplugindump version dump issue

Changed major and minor version of created QQmlType. Using major and
minor version of a candidate instead of major and minor versions passed
to a function.

Task-number: QTBUG-67292
Change-Id: I2c30f5e8f49aa0be3a1d5b404ab16eb376ad8092
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index ab63489dbf..e379d416fd 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -758,8 +758,10 @@ bool QQmlImportInstance::resolveType(QQmlTypeLoader *typeLoader, const QHashedSt
     if (majversion >= 0 && minversion >= 0) {
         QQmlType t = QQmlMetaType::qmlType(type, uri, majversion, minversion);
         if (t.isValid()) {
-            if (vmajor) *vmajor = majversion;
-            if (vminor) *vminor = minversion;
+            if (vmajor)
+                *vmajor = majversion;
+            if (vminor)
+                *vminor = minversion;
             if (type_return)
                 *type_return = t;
             return true;
@@ -818,10 +820,13 @@ bool QQmlImportInstance::resolveType(QQmlTypeLoader *typeLoader, const QHashedSt
         if (candidate != end) {
             if (!base) // ensure we have a componentUrl
                 componentUrl = resolveLocalUrl(QString(url + candidate->typeName + dotqml_string), candidate->fileName);
-            int major = vmajor ? *vmajor : -1;
-            int minor = vminor ? *vminor : -1;
             QQmlType returnType = fetchOrCreateTypeForUrl(componentUrl, type, isCompositeSingleton,
-                                                          nullptr, major, minor);
+                                                          nullptr, candidate->majorVersion,
+                                                          candidate->minorVersion);
+            if (vmajor)
+                *vmajor = candidate->majorVersion;
+            if (vminor)
+                *vminor = candidate->minorVersion;
             if (type_return)
                 *type_return = returnType;
             return returnType.isValid();