From fcae81ce68ed68b1e1e9f82291841ef2b6f2f962 Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Wed, 22 Feb 2012 14:27:18 +0100
Subject: DebugMessageService: Remove unneeded data

Do not send version info of QMessageLogContext.

Change-Id: I32dd4a548ee2b918e5d04dcdffd4d5545fd2f54f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
---
 src/declarative/debugger/qdebugmessageservice.cpp                | 2 +-
 .../debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp   | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/declarative/debugger/qdebugmessageservice.cpp b/src/declarative/debugger/qdebugmessageservice.cpp
index 4a17da94fa..3f18a0fe4b 100644
--- a/src/declarative/debugger/qdebugmessageservice.cpp
+++ b/src/declarative/debugger/qdebugmessageservice.cpp
@@ -95,7 +95,7 @@ void QDebugMessageService::sendDebugMessage(QtMsgType type,
     QByteArray message;
     QDataStream ws(&message, QIODevice::WriteOnly);
     ws << QByteArray("MESSAGE") << type << QString::fromLocal8Bit(buf).toUtf8();
-    ws << ctxt.version << QString::fromLatin1(ctxt.file).toUtf8();
+    ws << QString::fromLatin1(ctxt.file).toUtf8();
     ws << ctxt.line << QString::fromLatin1(ctxt.function).toUtf8();
 
     sendMessage(message);
diff --git a/tests/auto/declarative/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp b/tests/auto/declarative/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
index 0e15a2dc77..94738dc083 100644
--- a/tests/auto/declarative/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+++ b/tests/auto/declarative/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
@@ -81,7 +81,6 @@ struct LogEntry {
 
     QtMsgType type;
     QString message;
-    int version;
     int line;
     QString file;
     QString function;
@@ -136,8 +135,7 @@ void QDeclarativeDebugMsgClient::messageReceived(const QByteArray &data)
         QByteArray file;
         QByteArray function;
         int line;
-        int version;
-        ds >> type >> message >> version >> file >> line >> function;
+        ds >> type >> message >> file >> line >> function;
         QVERIFY(ds.atEnd());
 
         QVERIFY(type >= QtDebugMsg);
@@ -145,9 +143,8 @@ void QDeclarativeDebugMsgClient::messageReceived(const QByteArray &data)
 
         LogEntry entry((QtMsgType)type, QString::fromUtf8(message));
         entry.line = line;
-        entry.version = version;
-        entry.file = QString::fromLatin1(file);
-        entry.function = QString::fromLatin1(function);
+        entry.file = QString::fromUtf8(file);
+        entry.function = QString::fromUtf8(function);
         logBuffer << entry;
         emit debugOutput();
     } else {
-- 
cgit v1.2.3