Merge remote-tracking branch 'origin/7.0' into 8.0

Change-Id: Ib669e2e993c4675a7382f721ccb7d6ecff11fc20

1 files changed, 11 insertions, 2 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index c6acc5e5f9..5183b5cd8f 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -118,6 +118,7 @@
 #endif
 
 #ifdef IMPORT_QUICK3D_ASSETS
+#include <QtCore/qjsonobject.h>
 #include <QtQuick3DAssetImport/private/qssgassetimportmanager_p.h>
 #endif
 
@@ -303,7 +304,15 @@ void Qt5InformationNodeInstanceServer::resolveImportSupport()
 #ifdef IMPORT_QUICK3D_ASSETS
     QSSGAssetImportManager importManager;
     const QHash<QString, QStringList> supportedExtensions = importManager.getSupportedExtensions();
-    const QHash<QString, QVariantMap> supportedOptions = importManager.getAllOptions();
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
+#define AS_VARIANT_MAP(IT) IT.value().toVariantMap()
+    using PluginOptionMaps = QSSGAssetImportManager::PluginOptionMaps;
+#else
+#define AS_VARIANT_MAP(IT) IT.value()
+    using PluginOptionMaps = QHash<QString, QVariantMap>;
+#endif // QT_VERSION >= 6.4.0
+
+    const PluginOptionMaps supportedOptions = importManager.getAllOptions();
 
     QVariantMap supportMap;
 
@@ -317,7 +326,7 @@ void Qt5InformationNodeInstanceServer::resolveImportSupport()
     QVariantMap optMap;
     auto itOpt = supportedOptions.constBegin();
     while (itOpt != supportedOptions.constEnd()) {
-        optMap.insert(itOpt.key(), itOpt.value());
+        optMap.insert(itOpt.key(), AS_VARIANT_MAP(itOpt));
         ++itOpt;
     }