diff options
| author | Kai Uwe Broulik <kde@privat.broulik.de> | 2023-08-17 23:09:21 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-08-22 09:12:56 +0200 |
| commit | 139d45c062ce6061b96f7ffe206babde4b596a98 (patch) | |
| tree | baa682f5741d8284731798f5c20e217b5c0f156d /src/qml/jsruntime/qv4qobjectwrapper.cpp | |
| parent | 5789ae5da56b4f17fd126154f8a55bc7fcd936d8 (diff) | |
QV4::QObjectWrapper: Use the object's actual meta type
Otherwise, a derived type's methods will not be found.
In our particular case we tried to call a method of 'B*' on a
QML attached property declared as 'A*'.
This restores the previous behavior of using the object()
for the meta type except for when it's a value type wrapper.
Amends commit 63b622d5908ec2960ce5dfa301e9d3fd4d92fdb4.
Pick-to: 6.6 6.5 6.2
Change-Id: I08b9f4b97a58c15fdc3703dd3c5d927cd1beb3ce
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Semih Yavuz <semih.yavuz@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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index d62675a2f4..868b799e57 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -2412,12 +2412,10 @@ const QMetaObject *Heap::QObjectMethod::metaObject() const { Scope scope(internalClass->engine); - if (Scoped<QV4::QObjectWrapper> objectWrapper(scope, wrapper); objectWrapper) - return objectWrapper->metaObject(); - if (Scoped<QV4::QQmlTypeWrapper> typeWrapper(scope, wrapper); typeWrapper) - return typeWrapper->metaObject(); if (Scoped<QV4::QQmlValueTypeWrapper> valueWrapper(scope, wrapper); valueWrapper) return valueWrapper->metaObject(); + if (QObject *self = object()) + return self->metaObject(); return nullptr; } |