diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-05 09:02:55 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-05 15:54:47 +0100 |
| commit | a9efc8e9dda35c1844c990991cea14a74ddeaf81 (patch) | |
| tree | 0b965861df43bfb48dcf29fa1fe1f1666fc8d7b6 /src/qml/jsruntime/qv4qobjectwrapper.cpp | |
| parent | 7d65ebf1e612120e3f3356f7370d98c0f67663b1 (diff) | |
QQmlEnginePrivate: remove functions that only forward to QQmlMetaType
As a drive-by, remove metatype-id to metatype conversion in
qqmlproperty.cpp
Task-number: QTBUG-82931
Change-Id: I88511bdc103bfb507b6c4401af103e0aec13894f
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4qobjectwrapper.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 86d37bb5ec..41a57e36c9 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1997,7 +1997,7 @@ bool CallArgument::fromValue(QMetaType metaType, QV4::ExecutionEngine *engine, c } else { QQmlMetaObject mo = ep ? ep->rawMetaObjectForType(callType) : QQmlMetaObject(); if (!mo.isNull()) { - QObject *obj = ep->toQObject(v); + QObject *obj = QQmlMetaType::toQObject(v); if (obj != nullptr && !QQmlMetaObject::canConvert(obj, mo)) { *qvariantPtr = QVariant(metaType, nullptr); |