feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Import3D: Update call to importFile() after change in QtQuick3d

Browse Source 
The function in QtQuick3d will from Qt 6.4.0 accept the json object
directly meaning it's no longer necessary to convert to a variant map
first.

Change-Id: If180672963cbfea78582f245431e246f84111c9b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Christian Strømme
2022-03-22 12:57:46 +01:00
committed by Miikka Heikkinen
parent d0af1c0316
commit 3335698fba
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.cpp
View File

@@ -52,7 +52,12 @@ void import3D(const QString &sourceAsset, const QString &outDir, const QString &
if (!optDoc.isNull() && optDoc.isObject()) { if (!optDoc.isNull() && optDoc.isObject()) {
QJsonObject optObj = optDoc.object(); 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) { != QSSGAssetImportManager::ImportState::Success) {
} }
} else { } else {

13
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
View File

@@ -118,6 +118,7 @@
#endif #endif
#ifdef IMPORT_QUICK3D_ASSETS #ifdef IMPORT_QUICK3D_ASSETS
#include <QtCore/qjsonobject.h>
#include <QtQuick3DAssetImport/private/qssgassetimportmanager_p.h> #include <QtQuick3DAssetImport/private/qssgassetimportmanager_p.h>
#endif #endif
@@ -303,7 +304,15 @@ void Qt5InformationNodeInstanceServer::resolveImportSupport()
#ifdef IMPORT_QUICK3D_ASSETS #ifdef IMPORT_QUICK3D_ASSETS
QSSGAssetImportManager importManager; QSSGAssetImportManager importManager;
const QHash<QString, QStringList> supportedExtensions = importManager.getSupportedExtensions(); 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; QVariantMap supportMap;
@@ -317,7 +326,7 @@ void Qt5InformationNodeInstanceServer::resolveImportSupport()
QVariantMap optMap; QVariantMap optMap;
auto itOpt = supportedOptions.constBegin(); auto itOpt = supportedOptions.constBegin();
while (itOpt != supportedOptions.constEnd()) { while (itOpt != supportedOptions.constEnd()) {
optMap.insert(itOpt.key(), itOpt.value()); optMap.insert(itOpt.key(), AS_VARIANT_MAP(itOpt));
++itOpt; ++itOpt;
} }