diff options
| author | BogDan Vatra <bogdan.vatra.ford@kdab.com> | 2016-06-20 16:24:12 +0300 |
|---|---|---|
| committer | Brett Stottlemyer <bstottle@ford.com> | 2016-06-20 18:57:44 +0000 |
| commit | a1135e86951c624175bf08a6714b3069ff6be714 (patch) | |
| tree | f7af54f6807b85afc0584ab202f909d47545e379 /src/remoteobjects/qremoteobjectsource.cpp | |
| parent | 1a025808cb2ef171fdd35e68da56c78577d5954d (diff) | |
Send property information of the changed signals
The new property is sent just before the signal invoke package, there
fore we just need to pass the propertyIndex not to serialized it again.
Change-Id: Id82030968b0e18f9f95e281e4f3fda950852857b
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Diffstat (limited to 'src/remoteobjects/qremoteobjectsource.cpp')
| -rw-r--r-- | src/remoteobjects/qremoteobjectsource.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/remoteobjects/qremoteobjectsource.cpp b/src/remoteobjects/qremoteobjectsource.cpp index 242af27..4f7e326 100644 --- a/src/remoteobjects/qremoteobjectsource.cpp +++ b/src/remoteobjects/qremoteobjectsource.cpp @@ -171,7 +171,7 @@ void QRemoteObjectSource::handleMetaCall(int index, QMetaObject::Call call, void if (listeners.empty()) return; - const int propertyIndex = m_api->propertyIndexFromSignal(index); + int propertyIndex = m_api->propertyIndexFromSignal(index); if (propertyIndex >= 0) { const int rawIndex = m_api->propertyRawIndexFromSignal(index); const auto target = m_api->isAdapterProperty(index) ? m_adapter : m_object; @@ -179,12 +179,13 @@ void QRemoteObjectSource::handleMetaCall(int index, QMetaObject::Call call, void qCDebug(QT_REMOTEOBJECT) << "Sending Invoke Property" << (m_api->isAdapterSignal(index) ? "via adapter" : "") << rawIndex << propertyIndex << mp.name() << mp.read(target); serializePropertyChangePacket(m_packet, m_api->name(), rawIndex, serializedProperty(mp, target)); m_packet.baseAddress = m_packet.size; + propertyIndex = rawIndex; } qCDebug(QT_REMOTEOBJECT) << "# Listeners" << listeners.length(); qCDebug(QT_REMOTEOBJECT) << "Invoke args:" << m_object << call << index << marshalArgs(index, a); - serializeInvokePacket(m_packet, m_api->name(), call, index, *marshalArgs(index, a)); + serializeInvokePacket(m_packet, m_api->name(), call, index, *marshalArgs(index, a), -1, propertyIndex); m_packet.baseAddress = 0; Q_FOREACH (ServerIoDevice *io, listeners) |