diff options
Diffstat (limited to 'src/qml/qml/qqmlstringconverters.cpp')
-rw-r--r-- | src/qml/qml/qqmlstringconverters.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlstringconverters.cpp b/src/qml/qml/qqmlstringconverters.cpp index 74dd5f431c..c7c111a052 100644 --- a/src/qml/qml/qqmlstringconverters.cpp +++ b/src/qml/qml/qqmlstringconverters.cpp @@ -75,8 +75,13 @@ QVariant QQmlStringConverters::variantFromString(const QString &s, int preferred return QVariant::fromValue(rectFFromString(s, ok)); case QMetaType::QRect: return QVariant::fromValue(rectFFromString(s, ok).toRect()); - default: - return QQml_valueTypeProvider()->createVariantFromJsObject(preferredType, QJSValue(s), ok); + default: { + QVariant ret; + bool success = QQml_valueTypeProvider()->createValueType(preferredType, QJSValue(s), &ret); + if (ok) + *ok = success; + return ret; + } } } |