diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-18 16:34:11 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-23 14:54:47 +0200 |
| commit | 2d02307e73b63c8d2ce935a9d7dd7b177c017f87 (patch) | |
| tree | 8751f6c3354d24bd4f13182e5178a98b8fca0263 /src/qml/qml/qqmlobjectcreator.cpp | |
| parent | 39b5be920cf65979df669d02a3410a7396be6ada (diff) | |
Condense the different value type creation functions into one
They all did the same thing.
Change-Id: I7661b19ad16c0713d46c4df337899e3897349b2e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index 809d1c4976..dc25aa9f0a 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -484,7 +484,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const break; case QMetaType::QColor: { QVariant data; - if (QQml_valueTypeProvider()->createValueFromString( + if (QQml_valueTypeProvider()->createValueType( QMetaType::QColor, compilationUnit->bindingValueAsString(binding), &data)) { property->writeProperty(_qobject, data.data(), propertyWriteFlags); } @@ -567,7 +567,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const case QMetaType::QVector4D: case QMetaType::QQuaternion: { QVariant result; - bool ok = QQml_valueTypeProvider()->createValueFromString( + bool ok = QQml_valueTypeProvider()->createValueType( propertyType, compilationUnit->bindingValueAsString(binding), &result); assertOrNull(ok); Q_UNUSED(ok); |