diff options
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.cpp')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.cpp index c1cbca6f5e..a6a0c8085f 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.cpp @@ -50,7 +50,12 @@ void import3D(const QString &sourceAsset, const QString &outDir, int exitId, con if (!optDoc.isNull() && optDoc.isObject()) { QString errorStr; QJsonObject optObj = optDoc.object(); - if (importer->importFile(sourceAsset, outDir, optObj.toVariantMap(), &errorStr) +#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)) + const auto &optionsMap = optObj; +#else + const auto optionsMap = optObj.toVariantMap(); +#endif // QT_VERSION >= 6.4.0 + if (importer->importFile(sourceAsset, outDir, optionsMap, &errorStr) != QSSGAssetImportManager::ImportState::Success) { qWarning() << __FUNCTION__ << "Failed to import 3D asset" << sourceAsset << "with error:" << errorStr; |