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>

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;
+    }
     }
 }