From 73464a1d9b96b2434f595f5715672e2ac8cbfefa Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 16 Jan 2012 14:19:10 +0100
Subject: [PATCH] QmlJSDebug: Support version 2 fo QDebugMessageService
Change-Id: Icc7af5ace287370a5f295e5c2d5dbee0e2c97610
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
---
.../qmljsdebugclient/qdebugmessageclient.cpp | 21 ++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/libs/qmljsdebugclient/qdebugmessageclient.cpp b/src/libs/qmljsdebugclient/qdebugmessageclient.cpp
index bc1a11f665d..6e4fd1965c2 100644
--- a/src/libs/qmljsdebugclient/qdebugmessageclient.cpp
+++ b/src/libs/qmljsdebugclient/qdebugmessageclient.cpp
@@ -55,14 +55,21 @@ void QDebugMessageClient::messageReceived(const QByteArray &data)
ds >> command;
if (command == "MESSAGE") {
- QByteArray messagePacket;
- ds >> messagePacket;
+ if (serviceVersion() == 1.0) {
+ QByteArray messagePacket;
+ ds >> messagePacket;
- QByteArray debugMessage;
- int type;
- QDataStream ms(messagePacket);
- ms >> type >> debugMessage;
- emit message(QtMsgType(type), QString::fromUtf8(debugMessage.data()));
+ QByteArray debugMessage;
+ int type;
+ QDataStream ms(messagePacket);
+ ms >> type >> debugMessage;
+ emit message(QtMsgType(type), QString::fromUtf8(debugMessage.data()));
+ } else {
+ int type;
+ QByteArray debugMessage;
+ ds >> type >> debugMessage;
+ emit message(QtMsgType(type), QString::fromUtf8(debugMessage));
+ }
}
}
--
GitLab