diff --git a/src/libs/qmldebug/qdebugmessageclient.cpp b/src/libs/qmldebug/qdebugmessageclient.cpp index c6c6433e676..48ffa89b5b3 100644 --- a/src/libs/qmldebug/qdebugmessageclient.cpp +++ b/src/libs/qmldebug/qdebugmessageclient.cpp @@ -55,30 +55,17 @@ void QDebugMessageClient::messageReceived(const QByteArray &data) ds >> command; if (command == "MESSAGE") { - if (serviceVersion() == 1.0) { - QByteArray messagePacket; - ds >> messagePacket; - - QByteArray debugMessage; - int type; - QDataStream ms(messagePacket); - ms >> type >> debugMessage; - QDebugContextInfo info; - emit message(QtMsgType(type), QString::fromUtf8(debugMessage.data()), - 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); - } + 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); } } diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index fd91502654d..52c4cb6efd2 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -978,8 +978,6 @@ QmlV8DebuggerClient::~QmlV8DebuggerClient() void QmlV8DebuggerClient::startSession() { - //Supports v2.0 and above - QTC_ASSERT(serviceVersion() >= CURRENT_SUPPORTED_VERSION, return); flushSendBuffer(); d->connect(); //Query for the V8 version. This is diff --git a/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h b/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h index 19935617c22..2f7c8f0ba47 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h +++ b/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h @@ -34,7 +34,6 @@ namespace Debugger { namespace Internal { -const float CURRENT_SUPPORTED_VERSION = 2.0; const char V8REQUEST[] = "v8request"; const char V8MESSAGE[] = "v8message"; const char BREAKONSIGNAL[] = "breakonsignal";