Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
        dependencies.yaml

Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca

2 files changed, 11 insertions, 1 deletions

diff --git a/tools/qmlimportscanner/Qt5QmlImportScannerConfig.cmake.in b/tools/qmlimportscanner/Qt5QmlImportScannerConfig.cmake.in
index 6cdfaf8f6f..f92b8d295d 100644
--- a/tools/qmlimportscanner/Qt5QmlImportScannerConfig.cmake.in
+++ b/tools/qmlimportscanner/Qt5QmlImportScannerConfig.cmake.in
@@ -182,3 +182,13 @@ but this file does not exist.  Possible reasons include:
     endif()
 !!ENDIF // !isEmpty(CMAKE_STATIC_TYPE)
 endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_import_qml_plugins)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_import_qml_plugins(${ARGV})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_import_qml_plugins(${ARGV})
+        endif()
+    endfunction()
+endif()
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index c37910bdaf..b563d7df95 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -509,7 +509,7 @@ QString generateCmakeIncludeFileContent(const QVariantList &importList) {
     QTextStream s(&content);
     int importsCount = 0;
     for (const QVariant &importVariant: importList) {
-        if (static_cast<QMetaType::Type>(importVariant.type()) == QMetaType::QVariantMap) {
+        if (static_cast<QMetaType::Type>(importVariant.userType()) == QMetaType::QVariantMap) {
             s << QStringLiteral("set(qml_import_scanner_import_") << importsCount
               << QStringLiteral(" \"");