From d9ed35f95835def9e3201719d986b56c01b160a2 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 8 Nov 2013 14:59:45 +0100 Subject: Debugger: Fix debugging with newer Qt Creator's Make sure we advertise the QDataStream version, so that Qt Creator doesn't fall back to Qt_4.7. This is the minimal change necessary to achieve this. QtQml does actually consider the maximum data version announced on the client side, but that would require bigger changes in this module ... Task-number: QTCREATORBUG-10694 Change-Id: I1f0f005429e4d2736dc8661dd8c0d869279f856e Reviewed-by: Aurindam Jana --- src/declarative/debugger/qdeclarativedebugserver.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/declarative') diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index a65c50b7..66f8cf13 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -266,7 +266,12 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message) QByteArray helloAnswer; { QDataStream out(&helloAnswer, QIODevice::WriteOnly); - out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << d->plugins.keys(); + QList fakeVersions; + for (int i = 0; i < d->plugins.size(); ++i) + fakeVersions << 1.0; + out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 + << protocolVersion << d->plugins.keys() + << fakeVersions << QDataStream().version(); } d->connection->send(QList() << helloAnswer); -- cgit v1.2.3