diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-10-06 10:44:08 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-10-08 06:41:49 +0200 |
| commit | 49e549934dbd993e9e352a5719f85d1a5475a2f5 (patch) | |
| tree | de71a4d8677f34bb331d64787891f99d59ced934 /src/qml/qml | |
| parent | 519e08f90c6f652b89b842505dae216b88e3053b (diff) | |
Adapt to changed return value for toDynamicMetaObject()
Change-Id: I6b68c89a36ba587a34a26b326ac8bff4ebe1c4cd
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlvaluetype.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvaluetype_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject_p.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp index 4b9653d8e9..7446322019 100644 --- a/src/qml/qml/qqmlvaluetype.cpp +++ b/src/qml/qml/qqmlvaluetype.cpp @@ -125,7 +125,7 @@ const QQmlValueType *QQmlGadgetPtrWrapper::valueType() const return static_cast<const QQmlValueType *>(d->metaObject); } -QAbstractDynamicMetaObject *QQmlValueType::toDynamicMetaObject(QObject *) +QMetaObject *QQmlValueType::toDynamicMetaObject(QObject *) { return this; } diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h index c006fc7532..b1e985ba7a 100644 --- a/src/qml/qml/qqmlvaluetype_p.h +++ b/src/qml/qml/qqmlvaluetype_p.h @@ -83,7 +83,7 @@ public: int metaTypeId() const { return metaType.id(); } // ---- dynamic meta object data interface - QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) override; + QMetaObject *toDynamicMetaObject(QObject *) override; void objectDestroyed(QObject *) override; int metaCall(QObject *obj, QMetaObject::Call type, int _id, void **argv) override; // ---- diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 5a11e40203..99663d9daa 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -398,7 +398,7 @@ bool QQmlInterceptorMetaObject::intercept(QMetaObject::Call c, int id, void **a) } -QAbstractDynamicMetaObject *QQmlInterceptorMetaObject::toDynamicMetaObject(QObject *o) +QMetaObject *QQmlInterceptorMetaObject::toDynamicMetaObject(QObject *o) { if (!hasAssignedMetaObjectData) { *static_cast<QMetaObject *>(this) = *cache->createMetaObject(); diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index 10fa0d89a2..41b9a42b51 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -99,7 +99,7 @@ public: static QQmlInterceptorMetaObject *get(QObject *obj); - QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *o) override; + QMetaObject *toDynamicMetaObject(QObject *o) override; // Used by auto-tests for inspection QQmlPropertyCache *propertyCache() const { return cache.data(); } |