diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2022-12-19 12:23:17 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2023-02-10 12:37:17 +0100 |
| commit | c889af388062bbee6e52e68a22ac8632fb12ff02 (patch) | |
| tree | 0b4823adb8ca383e0a55fcbeb6e262363c42e0e8 /src/render/shadergraph/qshadernodesloader.cpp | |
| parent | 390f724912eb73461295e68535e053eb27e28af9 (diff) | |
Remove Qt6 QT_VERSION checks from the code base
Those are left overs from the Qt 5.15 to Qt 6 port. Now that both
code based have diverged, there's no much point in keeping those
checks.
Pick-to: 6.5
Change-Id: I4e83876b6b4cb18b181af32e376f4411054a1183
Reviewed-by: Mike Krus <mike.krus@kdab.com>
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 { |