diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2018-12-18 10:19:59 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2018-12-21 13:33:53 +0000 |
| commit | b89cee7871b10ccb1e80cd0afa222e41f8ccdd6f (patch) | |
| tree | 0ef340ee08893c0e1a6d23bece182ac5a2e2fba4 /src/remoteobjects/qremoteobjectsourceio.cpp | |
| parent | 0eb8ff632f0580f18a7b8de97dc0a2175f61943f (diff) | |
QVariant is also a standalone type and we must treated accordingly
QVariant::data() gives us access to its internal pointer of the internal
data type, but if the type is a QVariant we can't use QVariant::data()
anymore.
Change-Id: Ifad5f5d5884913c38b289c69b50630c735eea7d6
Fix: QTBUG-72064
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Diffstat (limited to 'src/remoteobjects/qremoteobjectsourceio.cpp')
| -rw-r--r-- | src/remoteobjects/qremoteobjectsourceio.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/remoteobjects/qremoteobjectsourceio.cpp b/src/remoteobjects/qremoteobjectsourceio.cpp index c5bf36e..25d69dc 100644 --- a/src/remoteobjects/qremoteobjectsourceio.cpp +++ b/src/remoteobjects/qremoteobjectsourceio.cpp @@ -240,7 +240,7 @@ void QRemoteObjectSourceIo::onServerRead(QObject *conn) if (!QMetaType(typeId).sizeOf()) typeId = QVariant::Invalid; QVariant returnValue(typeId, nullptr); - source->invoke(QMetaObject::InvokeMetaMethod, source->m_api->isAdapterMethod(index), resolvedIndex, m_rxArgs, &returnValue); + source->invoke(QMetaObject::InvokeMetaMethod, index, m_rxArgs, &returnValue); // send reply if wanted if (serialId >= 0) { serializeInvokeReplyPacket(m_packet, m_rxName, serialId, returnValue); @@ -257,7 +257,7 @@ void QRemoteObjectSourceIo::onServerRead(QObject *conn) qRODebug(this) << "Adapter (write property) Invoke-->" << m_rxName << source->m_adapter->metaObject()->property(resolvedIndex).name(); else qRODebug(this) << "Source (write property) Invoke-->" << m_rxName << source->m_object->metaObject()->property(resolvedIndex).name(); - source->invoke(QMetaObject::WriteProperty, source->m_api->isAdapterProperty(index), resolvedIndex, m_rxArgs); + source->invoke(QMetaObject::WriteProperty, index, m_rxArgs); } } break; |