Use value type providers in metaTypeFromJS

Pick-to: 6.2
Task-number: QTBUG-96144
Change-Id: If12f669ae33bb8ae4768ca79e4ca985f70a2651d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 9 insertions, 19 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 7e87b8be75..93a15669ee 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -2464,25 +2464,6 @@ bool ExecutionEngine::metaTypeFromJS(const Value &value, QMetaType metaType, voi
         }
     }
 
-#if 0
-    if (isQtVariant(value)) {
-        const QVariant &var = variantValue(value);
-        // ### Enable once constructInPlace() is in qt master.
-        if (var.userType() == type) {
-            QMetaType::constructInPlace(type, data, var.constData());
-            return true;
-        }
-        if (var.canConvert(type)) {
-            QVariant vv = var;
-            vv.convert(type);
-            Q_ASSERT(vv.userType() == type);
-            QMetaType::constructInPlace(type, data, vv.constData());
-            return true;
-        }
-
-    }
-#endif
-
     // Try to use magic; for compatibility with qjsvalue_cast.
 
     if (convertToNativeQObject(value, metaType, reinterpret_cast<void **>(data)))
@@ -2533,6 +2514,15 @@ bool ExecutionEngine::metaTypeFromJS(const Value &value, QMetaType metaType, voi
     } else if (metaType == QMetaType::fromType<QJSValue>()) {
         QJSValuePrivate::setValue(reinterpret_cast<QJSValue*>(data), value.asReturnedValue());
         return true;
+    } else if (!isPointer) {
+        QVariant val;
+        if (QQml_valueTypeProvider()->createValueType(
+                    metaType, QJSValuePrivate::fromReturnedValue(value.asReturnedValue()), val)) {
+            Q_ASSERT(val.metaType() == metaType);
+            metaType.destruct(data);
+            metaType.construct(data, val.constData());
+            return true;
+        }
     }
 
     return false;