From 0b67dd7e132d7d618fa538e8c4a275c874543342 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 3 Nov 2015 14:32:25 +0100 Subject: 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 --- src/qml/debugger/debugger.pri | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/qml/debugger/debugger.pri') diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri index 62b375f72f..30a44eedd1 100644 --- a/src/qml/debugger/debugger.pri +++ b/src/qml/debugger/debugger.pri @@ -6,8 +6,7 @@ SOURCES += \ $$PWD/qqmldebugservice.cpp \ $$PWD/qqmldebugserviceinterfaces.cpp \ $$PWD/qqmlabstractprofileradapter.cpp \ - $$PWD/qqmlprofiler.cpp \ - $$PWD/qpacket.cpp + $$PWD/qqmlprofiler.cpp HEADERS += \ $$PWD/qqmldebugconnector_p.h \ @@ -19,7 +18,6 @@ HEADERS += \ $$PWD/qqmldebug.h \ $$PWD/qqmlprofilerdefinitions_p.h \ $$PWD/qqmlabstractprofileradapter_p.h \ - $$PWD/qqmlprofiler_p.h \ - $$PWD/qpacket_p.h + $$PWD/qqmlprofiler_p.h INCLUDEPATH += $$PWD -- cgit v1.2.3