From a54685aa59e48fc993c1d3531d6abd9c70ca3a56 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 26 Sep 2017 16:11:02 +0200 Subject: [PATCH] QmlDebug: Use versioned packets for engine control client The service also uses versioned packets and not doing this might create subtle bugs. Change-Id: I54dfbe4f8e3d3a71daf2fe503a609c52c6a158bb Reviewed-by: hjk --- src/libs/qmldebug/qmlenginecontrolclient.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libs/qmldebug/qmlenginecontrolclient.cpp b/src/libs/qmldebug/qmlenginecontrolclient.cpp index 53a3ac47562..dba74b30cbb 100644 --- a/src/libs/qmldebug/qmlenginecontrolclient.cpp +++ b/src/libs/qmldebug/qmlenginecontrolclient.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "qmlenginecontrolclient.h" +#include "qpacketprotocol.h" #include "utils/qtcassert.h" namespace QmlDebug { @@ -66,9 +67,9 @@ void QmlEngineControlClient::releaseEngine(int engineId) void QmlEngineControlClient::messageReceived(const QByteArray &data) { - QDataStream stream(data); - int message; - int id; + QPacket stream(dataStreamVersion(), data); + qint32 message; + qint32 id; QString name; stream >> message >> id; @@ -104,10 +105,9 @@ void QmlEngineControlClient::messageReceived(const QByteArray &data) void QmlEngineControlClient::sendCommand(QmlEngineControlClient::CommandType command, int engineId) { - QByteArray data; - QDataStream stream(&data, QIODevice::WriteOnly); - stream << int(command) << engineId; - QmlDebugClient::sendMessage(data); + QPacket stream(dataStreamVersion()); + stream << static_cast(command) << engineId; + QmlDebugClient::sendMessage(stream.data()); } }