diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-09-10 14:29:28 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-09-25 18:53:13 +0000 |
commit | 10a712eb980f32492c65dcb8441f6c5d29192a82 (patch) | |
tree | 3eacea58472a7a275bd171382b406d8d0fae4e6c /src/qml/util | |
parent | 9d58167d352b2f860f473fd74b63541d7659b811 (diff) |
Reimplement the right metaCall() method
The goal should be to make these dynamic metaobjects
independent of the concrete QObject instance.
Change-Id: I13448420d15792918cc30e994a8d6d83216a0a1a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/util')
-rw-r--r-- | src/qml/util/qqmladaptormodel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp index 29398ff98c..c61144dd8f 100644 --- a/src/qml/util/qqmladaptormodel.cpp +++ b/src/qml/util/qqmladaptormodel.cpp @@ -788,8 +788,11 @@ public: m_type->release(); } - int metaCall(QMetaObject::Call call, int id, void **arguments) + int metaCall(QObject *o, QMetaObject::Call call, int id, void **arguments) { + Q_ASSERT(o == m_data); + Q_UNUSED(o); + static const int objectPropertyOffset = QObject::staticMetaObject.propertyCount(); if (id >= m_type->propertyOffset && (call == QMetaObject::ReadProperty |