Commit 879766d8 authored by Aurindam Jana's avatar Aurindam Jana

Notify disconnect to debug server when inferiorshutdownrequested

Change-Id: I15bb1342f647362cb00e4b0d0453b663a2d3f637
Reviewed-on: http://codereview.qt.nokia.com/3095Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarChristiaan Janssen <christiaan.janssen@nokia.com>
parent 22e65369
......@@ -59,6 +59,7 @@ public:
virtual void continueInferior() = 0;
virtual void interruptInferior() = 0;
virtual void shutdownInferior() = 0;
virtual void activateFrame(int index) = 0;
......
......@@ -375,10 +375,13 @@ void QmlEngine::handleRemoteSetupFailed(const QString &message)
void QmlEngine::shutdownInferior()
{
d->m_adapter.activeDebuggerClient()->shutdownInferior();
if (isSlaveEngine()) {
resetLocation();
}
stopApplicationLauncher();
notifyInferiorShutdownOk();
}
......@@ -417,7 +420,7 @@ void QmlEngine::interruptInferior()
{
logMessage(LogSend, "INTERRUPT");
d->m_adapter.activeDebuggerClient()->interruptInferior();
notifyInferiorStopOk();
}
void QmlEngine::executeStep()
......@@ -724,8 +727,6 @@ void QmlEngine::inferiorSpontaneousStop()
{
if (state() == InferiorRunOk)
notifyInferiorSpontaneousStop();
else
notifyInferiorStopOk();
}
void QmlEngine::disconnected()
......
......@@ -192,6 +192,18 @@ void QmlV8DebuggerClient::interruptInferior()
}
void QmlV8DebuggerClient::shutdownInferior()
{
QByteArray request;
JsonInputStream(request) << '{' << INITIALPARAMS ;
JsonInputStream(request) << ',' << "command" << ':' << "disconnect";
JsonInputStream(request) << '}';
sendMessage(packMessage(request));
}
void QmlV8DebuggerClient::activateFrame(int index)
{
setLocals(index);
......
......@@ -59,6 +59,7 @@ public:
void continueInferior();
void interruptInferior();
void shutdownInferior();
void activateFrame(int index);
......
......@@ -192,6 +192,11 @@ void QScriptDebuggerClient::interruptInferior()
sendMessage(reply);
}
void QScriptDebuggerClient::shutdownInferior()
{
}
void QScriptDebuggerClient::activateFrame(int index)
{
QByteArray reply;
......
......@@ -58,6 +58,7 @@ public:
void continueInferior();
void interruptInferior();
void shutdownInferior();
void activateFrame(int index);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment