diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-01 11:50:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-01 11:50:31 +0100 |
| commit | 3df5d656896904d5db5983a7218643f1a43acdbb (patch) | |
| tree | 3f98942663abaec3a389f5ab15ce67f2c8c9999b /src/remoteobjects/qremoteobjectsourceio.cpp | |
| parent | d3cde521533787f5f91364ffdba3e0a386d131f6 (diff) | |
| parent | e1c0dbeadcfd34699f080edc49815761672616c1 (diff) | |
Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: I3822ef45344b07191c3b32883241db5e43e04187
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 0b9cfc1..c2dc70a 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; |