feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Remove old code

Browse Source 
Version specific snippets were introduced to
avoid incompatibilities during Qt5 development.

Change-Id: I60fa9beafc9d55b687c08e13cdf531baecb10fbb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Aurindam Jana
2012-09-28 15:21:04 +02:00
parent fa9dbd3bf6
commit 6067411db4
3 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/libs/qmldebug/qdebugmessageclient.cpp
View File

@@ -55,30 +55,17 @@ void QDebugMessageClient::messageReceived(const QByteArray &data)
ds >> command; ds >> command;
if (command == "MESSAGE") { if (command == "MESSAGE") {
if (serviceVersion() == 1.0) { int type;
QByteArray messagePacket; int line;
ds >> messagePacket; QByteArray debugMessage;
QByteArray file;
QByteArray debugMessage; QByteArray function;
int type; ds >> type >> debugMessage >> file >> line >> function;
QDataStream ms(messagePacket); QDebugContextInfo info;
ms >> type >> debugMessage; info.line = line;
QDebugContextInfo info; info.file = QString::fromUtf8(file);
emit message(QtMsgType(type), QString::fromUtf8(debugMessage.data()), info.function = QString::fromUtf8(function);
info); emit message(QtMsgType(type), QString::fromUtf8(debugMessage), info);
} else {
int type;
int line;
QByteArray debugMessage;
QByteArray file;
QByteArray function;
ds >> type >> debugMessage >> file >> line >> function;
QDebugContextInfo info;
info.line = line;
info.file = QString::fromUtf8(file);
info.function = QString::fromUtf8(function);
emit message(QtMsgType(type), QString::fromUtf8(debugMessage), info);
}
} }
} }

2
src/plugins/debugger/qml/qmlv8debuggerclient.cpp
View File

@@ -978,8 +978,6 @@ QmlV8DebuggerClient::~QmlV8DebuggerClient()
void QmlV8DebuggerClient::startSession() void QmlV8DebuggerClient::startSession()
{ {
//Supports v2.0 and above
QTC_ASSERT(serviceVersion() >= CURRENT_SUPPORTED_VERSION, return);
flushSendBuffer(); flushSendBuffer();
d->connect(); d->connect();
//Query for the V8 version. This is //Query for the V8 version. This is

1
src/plugins/debugger/qml/qmlv8debuggerclientconstants.h
View File

@@ -34,7 +34,6 @@
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
const float CURRENT_SUPPORTED_VERSION = 2.0;
const char V8REQUEST[] = "v8request"; const char V8REQUEST[] = "v8request";
const char V8MESSAGE[] = "v8message"; const char V8MESSAGE[] = "v8message";
const char BREAKONSIGNAL[] = "breakonsignal"; const char BREAKONSIGNAL[] = "breakonsignal";