diff options
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qshadergraphloader.cpp | 6 | ||||
| -rw-r--r-- | src/gui/util/qshadernodesloader.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/util/qshadergraphloader.cpp b/src/gui/util/qshadergraphloader.cpp index 26848020f2..585becf47a 100644 --- a/src/gui/util/qshadergraphloader.cpp +++ b/src/gui/util/qshadergraphloader.cpp @@ -187,13 +187,13 @@ void QShaderGraphLoader::load() if (parameterValue.isObject()) { const QJsonObject parameterObject = parameterValue.toObject(); const QString type = parameterObject.value(QStringLiteral("type")).toString(); - const int typeId = QMetaType::type(type.toUtf8()); + const int typeId = QMetaType::fromName(type.toUtf8()).id(); const QString value = parameterObject.value(QStringLiteral("value")).toString(); auto variant = QVariant(value); - if (QMetaType::typeFlags(typeId) & QMetaType::IsEnumeration) { - const QMetaObject *metaObject = QMetaType::metaObjectForType(typeId); + if (QMetaType(typeId).flags() & QMetaType::IsEnumeration) { + const QMetaObject *metaObject = QMetaType(typeId).metaObject(); const char *className = metaObject->className(); const QByteArray enumName = type.mid(static_cast<int>(qstrlen(className)) + 2).toUtf8(); const QMetaEnum metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName)); diff --git a/src/gui/util/qshadernodesloader.cpp b/src/gui/util/qshadernodesloader.cpp index 349f11c541..a29b0925e1 100644 --- a/src/gui/util/qshadernodesloader.cpp +++ b/src/gui/util/qshadernodesloader.cpp @@ -160,13 +160,13 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject) if (parameterValue.isObject()) { const QJsonObject parameterObject = parameterValue.toObject(); const QString type = parameterObject.value(QStringLiteral("type")).toString(); - const int typeId = QMetaType::type(type.toUtf8()); + const int typeId = QMetaType::fromName(type.toUtf8()).id(); const QString value = parameterObject.value(QStringLiteral("value")).toString(); auto variant = QVariant(value); - if (QMetaType::typeFlags(typeId) & QMetaType::IsEnumeration) { - const QMetaObject *metaObject = QMetaType::metaObjectForType(typeId); + if (QMetaType(typeId).flags() & QMetaType::IsEnumeration) { + const QMetaObject *metaObject = QMetaType(typeId).metaObject(); const char *className = metaObject->className(); const QByteArray enumName = type.mid(static_cast<int>(qstrlen(className)) + 2).toUtf8(); const QMetaEnum metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName)); |