QmlDebug: Restructure QPacket and QPacketProtocol

We cannot use the same data stream version for the client and server
versions of QPacket and QPacketProtocol should not deal with QPackets
but with simple byte arrays because the underlying QDataStream is hard
to copy.

The new QQmlDebugPacket picks its data stream version from
QQmlDebugConnector now, which adjusts it when connecting. As there can
only ever be one QQmlDebugConnector, we can keep the version static.

The clients need to query the connection for the correct version. We
may connect to several different servers sequentially or we may have a
server running while using a client, and we don't want to confuse the
versions between those.

With this in place, all remaining occurrences of QDataStream are
replaced with QPacket or QQmlDebugPacket.

Change-Id: I3f6ba73fcbfad5e8df917c5feb9308116738a614
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

9 files changed, 79 insertions, 102 deletions

diff --git a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
index 779ab8c2a1..0289a6d725 100644
--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
@@ -37,6 +37,7 @@
 
 #include <private/qqmldebugclient_p.h>
 #include <private/qqmldebugconnection_p.h>
+#include <private/qpacket_p.h>
 
 #include <QtCore/qstring.h>
 #include <QtCore/qlibraryinfo.h>
@@ -119,7 +120,7 @@ void QQmlDebugMsgClient::stateChanged(State state)
 
 void QQmlDebugMsgClient::messageReceived(const QByteArray &data)
 {
-    QDataStream ds(data);
+    QPacket ds(connection()->currentDataStreamVersion(), data);
     QByteArray command;
     ds >> command;
 
diff --git a/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
index 816ac3f278..b68cc5d6c9 100644
--- a/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -96,13 +96,13 @@ void tst_QPacketProtocol::send()
     QByteArray ba;
     int num;
 
-    QPacket packet;
+    QPacket packet(QDataStream::Qt_DefaultCompiledVersion);
     packet << "Hello world" << 123;
-    out.send(packet);
+    out.send(packet.data());
 
     QVERIFY(QQmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
 
-    QPacket p = in.read();
+    QPacket p(QDataStream::Qt_DefaultCompiledVersion, in.read());
     p >> ba >> num;
     QCOMPARE(ba, QByteArray("Hello world") + '\0');
     QCOMPARE(num, 123);
@@ -119,9 +119,9 @@ void tst_QPacketProtocol::packetsAvailable()
     QCOMPARE(in.packetsAvailable(), qint64(0));
 
     for (int i=0; i<packetCount; i++) {
-        QPacket packet;
+        QPacket packet(QDataStream::Qt_DefaultCompiledVersion);
         packet << "Hello";
-        out.send(packet);
+        out.send(packet.data());
     }
 
     QVERIFY(QQmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
@@ -142,30 +142,30 @@ void tst_QPacketProtocol::read()
     QPacketProtocol in(m_client);
     QPacketProtocol out(m_serverConn);
 
-    QVERIFY(in.read().atEnd());
+    QVERIFY(in.read().isEmpty());
 
-    QPacket packet;
+    QPacket packet(QDataStream::Qt_DefaultCompiledVersion);
     packet << 123;
-    out.send(packet);
+    out.send(packet.data());
 
-    QPacket packet2;
+    QPacket packet2(QDataStream::Qt_DefaultCompiledVersion);
     packet2 << 456;
-    out.send(packet2);
+    out.send(packet2.data());
     QVERIFY(QQmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
 
     int num;
 
-    QPacket p1 = in.read();
+    QPacket p1(QDataStream::Qt_DefaultCompiledVersion, in.read());
     QVERIFY(!p1.atEnd());
     p1 >> num;
     QCOMPARE(num, 123);
 
-    QPacket p2 = in.read();
+    QPacket p2(QDataStream::Qt_DefaultCompiledVersion, in.read());
     QVERIFY(!p2.atEnd());
     p2 >> num;
     QCOMPARE(num, 456);
 
-    QVERIFY(in.read().atEnd());
+    QVERIFY(in.read().isEmpty());
 }
 
 QTEST_MAIN(tst_QPacketProtocol)
diff --git a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
index d6facc4200..13674fdb61 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
@@ -37,6 +37,7 @@
 
 #include <private/qqmldebugclient_p.h>
 #include <private/qqmldebugconnection_p.h>
+#include <private/qpacket_p.h>
 
 #include <QtTest/qtest.h>
 #include <QtCore/qprocess.h>
@@ -559,11 +560,9 @@ void QJSDebugClient::setBreakpoint(QString type, QString target, int line, int c
     //    }
 
     if (type == QLatin1String(EVENT)) {
-        QByteArray reply;
-        QDataStream rs(&reply, QIODevice::WriteOnly);
+        QPacket rs(connection()->currentDataStreamVersion());
         rs <<  target.toUtf8() << enabled;
-        sendMessage(packMessage(QByteArray("breakonsignal"), reply));
-
+        sendMessage(packMessage(QByteArray("breakonsignal"), rs.data()));
     } else {
         VARIANTMAPINIT;
         jsonVal.setProperty(QLatin1String(COMMAND),QJSValue(QLatin1String(SETBREAKPOINT)));
@@ -711,7 +710,7 @@ void QJSDebugClient::stateChanged(State state)
 
 void QJSDebugClient::messageReceived(const QByteArray &data)
 {
-    QDataStream ds(data);
+    QPacket ds(connection()->currentDataStreamVersion(), data);
     QByteArray command;
     ds >> command;
 
@@ -796,11 +795,10 @@ void QJSDebugClient::flushSendBuffer()
 
 QByteArray QJSDebugClient::packMessage(const QByteArray &type, const QByteArray &message)
 {
-    QByteArray reply;
-    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QPacket rs(connection()->currentDataStreamVersion());
     QByteArray cmd = "V8DEBUG";
     rs << cmd << type << message;
-    return reply;
+    return rs.data();
 }
 
 void tst_QQmlDebugJS::initTestCase()
diff --git a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
index 80eb5fbb3c..e2cdc89a56 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
+++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
@@ -207,7 +207,7 @@ void tst_QQmlDebugService::checkSupportForDataStreamVersion()
     client.sendMessage(msg);
     QByteArray resp = client.waitForResponse();
     QCOMPARE(resp, msg);
-    QCOMPARE(m_conn->dataStreamVersion(), int(QDataStream::Qt_5_0));
+    QCOMPARE(m_conn->currentDataStreamVersion(), int(QDataStream::Qt_DefaultCompiledVersion));
 }
 
 void tst_QQmlDebugService::idForObject()
@@ -250,7 +250,7 @@ void tst_QQmlDebugService::checkSupportForOldDataStreamVersion()
     //create a new connection;
     delete m_conn;
     m_conn = new QQmlDebugConnection(this);
-    m_conn->setDataStreamVersion(QDataStream::Qt_4_7);
+    m_conn->setMaximumDataStreamVersion(QDataStream::Qt_5_0);
     for (int i = 0; i < 50; ++i) {
         // try for 5 seconds ...
         m_conn->connectToHost("127.0.0.1", PORT);
@@ -270,7 +270,7 @@ void tst_QQmlDebugService::checkSupportForOldDataStreamVersion()
     client.sendMessage(msg);
     QByteArray resp = client.waitForResponse();
     QCOMPARE(resp, msg);
-    QCOMPARE(m_conn->dataStreamVersion(), int(QDataStream::Qt_4_7));
+    QCOMPARE(m_conn->currentDataStreamVersion(), int(QDataStream::Qt_5_0));
 }
 
 QTEST_MAIN(tst_QQmlDebugService)
diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
index 961fe2f50c..0a6c6c9a92 100644
--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
@@ -36,6 +36,7 @@
 
 #include <private/qqmldebugclient_p.h>
 #include <private/qqmldebugconnection_p.h>
+#include <private/qpacket_p.h>
 
 #include <QtTest/qtest.h>
 #include <QtCore/qlibraryinfo.h>
@@ -69,10 +70,9 @@ public:
 
 
     void command(CommandType command, int engine) {
-        QByteArray message;
-        QDataStream stream(&message, QIODevice::WriteOnly);
+        QPacket stream(connection()->currentDataStreamVersion());
         stream << (int)command << engine;
-        sendMessage(message);
+        sendMessage(stream.data());
     }
 
     QList<int> startingEngines;
@@ -119,8 +119,7 @@ private slots:
 
 void QQmlEngineControlClient::messageReceived(const QByteArray &message)
 {
-    QByteArray msg = message;
-    QDataStream stream(&msg, QIODevice::ReadOnly);
+    QPacket stream(connection()->currentDataStreamVersion(), message);
 
     int messageType;
     int engineId;
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 199da00e0c..3a9666b8fe 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -99,7 +99,7 @@ private:
     void complete();
 
     void unknownEvent(QQmlProfilerDefinitions::Message messageType, qint64 time, int detailType);
-    void unknownData(QDataStream &stream);
+    void unknownData(QPacket &stream);
 };
 
 void QQmlProfilerTestClient::traceStarted(qint64 time, int engineId)
@@ -230,7 +230,7 @@ void QQmlProfilerTestClient::unknownEvent(QQmlProfilerDefinitions::Message messa
                      .arg(messageType).arg(detailType).arg(time)));
 }
 
-void QQmlProfilerTestClient::unknownData(QDataStream &stream)
+void QQmlProfilerTestClient::unknownData(QPacket &stream)
 {
     QFAIL(qPrintable(QString::fromLatin1("%1 bytes of extra data after receiving message.")
                      .arg(stream.device()->bytesAvailable())));
diff --git a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp
index 7db0d9055d..ca7f31d7ce 100644
--- a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp
+++ b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp
@@ -32,8 +32,6 @@
 ****************************************************************************/
 
 #include "qqmlenginedebugclient.h"
-#include "qdatastream.h"
-
 #include <private/qqmldebugconnection_p.h>
 
 struct QmlObjectData {
@@ -48,7 +46,7 @@ struct QmlObjectData {
     int parentId;
 };
 
-QDataStream &operator>>(QDataStream &ds, QmlObjectData &data)
+QPacket &operator>>(QPacket &ds, QmlObjectData &data)
 {
     ds >> data.url >> data.lineNumber >> data.columnNumber >> data.idString
        >> data.objectName >> data.objectType >> data.objectId >> data.contextId
@@ -66,7 +64,7 @@ struct QmlObjectProperty {
     bool hasNotifySignal;
 };
 
-QDataStream &operator>>(QDataStream &ds, QmlObjectProperty &data)
+QPacket &operator>>(QPacket &ds, QmlObjectProperty &data)
 {
     int type;
     ds >> type >> data.name >> data.value >> data.valueTypeName
@@ -91,11 +89,10 @@ quint32 QQmlEngineDebugClient::addWatch(
     *success = false;
     if (state() == QQmlDebugClient::Enabled) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("WATCH_PROPERTY") << id << property.objectDebugId
            << property.name.toUtf8();
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -117,10 +114,9 @@ quint32 QQmlEngineDebugClient::addWatch(
     *success = false;
     if (state() == QQmlDebugClient::Enabled) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("WATCH_EXPR_OBJECT") << id << object.debugId << expr;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -133,10 +129,9 @@ quint32 QQmlEngineDebugClient::addWatch(
     *success = false;
     if (state() == QQmlDebugClient::Enabled) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("WATCH_OBJECT") << id << object.debugId;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -154,10 +149,9 @@ void QQmlEngineDebugClient::removeWatch(quint32 id, bool *success)
 {
     *success = false;
     if (state() == QQmlDebugClient::Enabled) {
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("NO_WATCH") << id;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
 }
@@ -169,10 +163,9 @@ quint32 QQmlEngineDebugClient::queryAvailableEngines(bool *success)
     *success = false;
     if (state() == QQmlDebugClient::Enabled) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("LIST_ENGINES") << id;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -186,10 +179,9 @@ quint32 QQmlEngineDebugClient::queryRootContexts(
     *success = false;
     if (state() == QQmlDebugClient::Enabled && engine.debugId != -1) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("LIST_OBJECTS") << id << engine.debugId;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -203,11 +195,9 @@ quint32 QQmlEngineDebugClient::queryObject(
     *success = false;
     if (state() == QQmlDebugClient::Enabled && object.debugId != -1) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("FETCH_OBJECT") << id << object.debugId << false <<
-              true;
-        sendMessage(message);
+        QPacket ds(m_connection->currentDataStreamVersion());
+        ds << QByteArray("FETCH_OBJECT") << id << object.debugId << false << true;
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -221,11 +211,10 @@ quint32 QQmlEngineDebugClient::queryObjectsForLocation(
     *success = false;
     if (state() == QQmlDebugClient::Enabled) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("FETCH_OBJECTS_FOR_LOCATION") << id << file << lineNumber
            << columnNumber << false << true;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -239,11 +228,9 @@ quint32 QQmlEngineDebugClient::queryObjectRecursive(
     *success = false;
     if (state() == QQmlDebugClient::Enabled && object.debugId != -1) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("FETCH_OBJECT") << id << object.debugId << true <<
-              true;
-        sendMessage(message);
+        QPacket ds(m_connection->currentDataStreamVersion());
+        ds << QByteArray("FETCH_OBJECT") << id << object.debugId << true << true;
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -257,11 +244,10 @@ quint32 QQmlEngineDebugClient::queryObjectsForLocationRecursive(const QString &f
     *success = false;
     if (state() == QQmlDebugClient::Enabled) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("FETCH_OBJECTS_FOR_LOCATION") << id << file << lineNumber
            << columnNumber << true << true;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -275,11 +261,10 @@ quint32 QQmlEngineDebugClient::queryExpressionResult(
     *success = false;
     if (state() == QQmlDebugClient::Enabled) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("EVAL_EXPRESSION") << id << objectDebugId << expr
            << engines()[0].debugId;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -293,10 +278,9 @@ quint32 QQmlEngineDebugClient::queryExpressionResultBC(
     *success = false;
     if (state() == QQmlDebugClient::Enabled) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("EVAL_EXPRESSION") << id << objectDebugId << expr;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -314,11 +298,10 @@ quint32 QQmlEngineDebugClient::setBindingForObject(
     *success = false;
     if (state() == QQmlDebugClient::Enabled && objectDebugId != -1) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("SET_BINDING") << id << objectDebugId << propertyName
            << bindingExpression << isLiteralValue << source << line;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -333,10 +316,9 @@ quint32 QQmlEngineDebugClient::resetBindingForObject(
     *success = false;
     if (state() == QQmlDebugClient::Enabled && objectDebugId != -1) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("RESET_BINDING") << id << objectDebugId << propertyName;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
@@ -350,17 +332,16 @@ quint32 QQmlEngineDebugClient::setMethodBody(
     *success = false;
     if (state() == QQmlDebugClient::Enabled && objectDebugId != -1) {
         id = getId();
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
+        QPacket ds(m_connection->currentDataStreamVersion());
         ds << QByteArray("SET_METHOD_BODY") << id << objectDebugId
            << methodName << methodBody;
-        sendMessage(message);
+        sendMessage(ds.data());
         *success = true;
     }
     return id;
 }
 
-void QQmlEngineDebugClient::decode(QDataStream &ds,
+void QQmlEngineDebugClient::decode(QPacket &ds,
                                    QmlDebugObjectReference &o,
                                    bool simple)
 {
@@ -421,7 +402,7 @@ void QQmlEngineDebugClient::decode(QDataStream &ds,
     }
 }
 
-void QQmlEngineDebugClient::decode(QDataStream &ds,
+void QQmlEngineDebugClient::decode(QPacket &ds,
                                    QList<QmlDebugObjectReference> &o,
                                    bool simple)
 {
@@ -434,7 +415,7 @@ void QQmlEngineDebugClient::decode(QDataStream &ds,
     }
 }
 
-void QQmlEngineDebugClient::decode(QDataStream &ds,
+void QQmlEngineDebugClient::decode(QPacket &ds,
                                    QmlDebugContextReference &c)
 {
     ds >> c.name >> c.debugId;
@@ -462,9 +443,7 @@ void QQmlEngineDebugClient::decode(QDataStream &ds,
 void QQmlEngineDebugClient::messageReceived(const QByteArray &data)
 {
     m_valid = false;
-    QDataStream ds(data);
-    ds.setVersion(m_connection->dataStreamVersion());
-
+    QPacket ds(m_connection->currentDataStreamVersion(), data);
 
     int queryId;
     QByteArray type;
diff --git a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.h b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.h
index 60f5a7e66b..d7f103d44a 100644
--- a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.h
+++ b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.h
@@ -35,6 +35,7 @@
 #define QQMLENGINEDEBUGCLIENT_H
 
 #include <private/qqmldebugclient_p.h>
+#include <private/qpacket_p.h>
 
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
@@ -205,9 +206,9 @@ public:
 
     quint32 getId() { return m_nextId++; }
 
-    void decode(QDataStream &, QmlDebugContextReference &);
-    void decode(QDataStream &, QmlDebugObjectReference &, bool simple);
-    void decode(QDataStream &ds, QList<QmlDebugObjectReference> &o, bool simple);
+    void decode(QPacket &ds, QmlDebugContextReference &);
+    void decode(QPacket &ds, QmlDebugObjectReference &, bool simple);
+    void decode(QPacket &ds, QList<QmlDebugObjectReference> &o, bool simple);
 
     QList<QmlDebugEngineReference> engines() { return m_engines; }
     QmlDebugContextReference rootContext() { return m_rootContext; }
diff --git a/tests/auto/qml/debugger/shared/qqmlinspectorclient.cpp b/tests/auto/qml/debugger/shared/qqmlinspectorclient.cpp
index 0c7ab60f5e..5fce58c17d 100644
--- a/tests/auto/qml/debugger/shared/qqmlinspectorclient.cpp
+++ b/tests/auto/qml/debugger/shared/qqmlinspectorclient.cpp
@@ -32,35 +32,34 @@
 ****************************************************************************/
 
 #include "qqmlinspectorclient.h"
-#include "qdatastream.h"
 
+#include <private/qpacket_p.h>
+#include <private/qqmldebugconnection_p.h>
 #include <QtCore/qdebug.h>
 
 void QQmlInspectorClient::setShowAppOnTop(bool showOnTop)
 {
-    QByteArray message;
-    QDataStream ds(&message, QIODevice::WriteOnly);
+    QPacket ds(connection()->currentDataStreamVersion());
     ds << QByteArray("request") << m_requestId++
        << QByteArray("showAppOnTop") << showOnTop;
 
-    sendMessage(message);
+    sendMessage(ds.data());
 }
 
 void QQmlInspectorClient::reloadQml(const QHash<QString, QByteArray> &changesHash)
 {
-    QByteArray message;
-    QDataStream ds(&message, QIODevice::WriteOnly);
+    QPacket ds(connection()->currentDataStreamVersion());
     m_reloadRequestId = m_requestId;
 
     ds << QByteArray("request") << m_requestId++
        << QByteArray("reload") << changesHash;
 
-    sendMessage(message);
+    sendMessage(ds.data());
 }
 
 void QQmlInspectorClient::messageReceived(const QByteArray &message)
 {
-    QDataStream ds(message);
+    QPacket ds(connection()->currentDataStreamVersion(), message);
     QByteArray type;
     ds >> type;