diff options
Diffstat (limited to 'src/render/shadergraph/qshadernodesloader.cpp')
-rw-r--r-- | src/render/shadergraph/qshadernodesloader.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/render/shadergraph/qshadernodesloader.cpp b/src/render/shadergraph/qshadernodesloader.cpp index c0d8dc703..44563bc43 100644 --- a/src/render/shadergraph/qshadernodesloader.cpp +++ b/src/render/shadergraph/qshadernodesloader.cpp @@ -126,11 +126,7 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject) if (parameterValue.isObject()) { const QJsonObject parameterObject = parameterValue.toObject(); const QString type = parameterObject.value(QStringLiteral("type")).toString(); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const QMetaType typeId = QMetaType::fromName(type.toUtf8()); -#else - const QMetaType typeId(QMetaType::type(type.toUtf8())); -#endif const QString value = parameterObject.value(QStringLiteral("value")).toString(); auto variant = QVariant(value); @@ -142,17 +138,9 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject) const QMetaEnum metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName)); const int enumValue = metaEnum.keyToValue(value.toUtf8()); variant = QVariant(enumValue); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) variant.convert(typeId); -#else - variant.convert(typeId.id()); -#endif } else { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) variant.convert(typeId); -#else - variant.convert(typeId.id()); -#endif } node.setParameter(parameterName, variant); } else { |