metaTypeToJS: use QMetaType instead of id

Task-number: QTBUG-82931
Change-Id: I7b663c5f774ef3edbb19d5f2ef53cfe623a8e4cf
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 94b0628cd7..dbb35cdde8 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -731,7 +731,7 @@ QJSValue QJSEngine::globalObject() const
 QJSManagedValue QJSEngine::createManaged(QMetaType type, const void *ptr)
 {
     QJSManagedValue result(m_v4Engine);
-    *result.d = m_v4Engine->metaTypeToJS(type.id(), ptr);
+    *result.d = m_v4Engine->metaTypeToJS(type, ptr);
     return result;
 }
 
@@ -739,7 +739,7 @@ QJSManagedValue QJSEngine::createManaged(QMetaType type, const void *ptr)
  *  \internal
  * used by QJSEngine::toScriptValue
  */
-QJSValue QJSEngine::create(int type, const void *ptr)
+QJSValue QJSEngine::create(QMetaType type, const void *ptr)
 {
     QV4::Scope scope(m_v4Engine);
     QV4::ScopedValue v(scope, scope.engine->metaTypeToJS(type, ptr));
diff --git a/src/qml/jsapi/qjsengine.h b/src/qml/jsapi/qjsengine.h
index 783f602c12..05c94ab261 100644
--- a/src/qml/jsapi/qjsengine.h
+++ b/src/qml/jsapi/qjsengine.h
@@ -90,7 +90,7 @@ public:
     template <typename T>
     inline QJSValue toScriptValue(const T &value)
     {
-        return create(qMetaTypeId<T>(), &value);
+        return create(QMetaType::fromType<T>(), &value);
     }
 
     template <typename T>
@@ -146,7 +146,7 @@ Q_SIGNALS:
 
 private:
     QJSManagedValue createManaged(QMetaType type, const void *ptr);
-    QJSValue create(int type, const void *ptr);
+    QJSValue create(QMetaType type, const void *ptr);
 
     static bool convertManaged(const QJSManagedValue &value, int type, void *ptr);
     static bool convertV2(const QJSValue &value, int type, void *ptr);