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

QmlV8DebuggerClient: Make breakpoint non-pending

Browse Source 
Make breakpoint non-pending when the breakpoint is accepted
by the v8 debugger.

Change-Id: Id67ce764ef6be9279d3fcc0f34734e5ac9541425
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Aurindam Jana
2012-03-14 10:11:08 +01:00
parent 4ab8925bc6
commit 41a66d7478
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1310,13 +1310,22 @@ void QmlV8DebuggerClient::messageReceived(const QByteArray &data)
BreakpointModelId id = d->breakpointsSync.take(seq); BreakpointModelId id = d->breakpointsSync.take(seq);
d->breakpoints.insert(id, index); d->breakpoints.insert(id, index);
BreakHandler *handler = d->engine->breakHandler(); //Is actual position info present? Then breakpoint was
if (handler->state(id) != BreakpointInserted) { //accepted
BreakpointResponse br = handler->response(id); const QVariantList actualLocations =
br.lineNumber = breakpointData.value(_("line") breakpointData.value(
).toInt() + 1; _("actual_locations")).toList();
handler->setResponse(id, br); if (actualLocations.count()) {
handler->notifyBreakpointInsertOk(id); //The breakpoint requested line should be same as
//actual line
BreakHandler *handler = d->engine->breakHandler();
if (handler->state(id) != BreakpointInserted) {
BreakpointResponse br = handler->response(id);
br.lineNumber = breakpointData.value(_("line")
).toInt() + 1;
handler->setResponse(id, br);
handler->notifyBreakpointInsertOk(id);
}
} }
@@ -1481,6 +1490,12 @@ void QmlV8DebuggerClient::messageReceived(const QByteArray &data)
br.functionName = invocationText; br.functionName = invocationText;
handler->setResponse(id, br); handler->setResponse(id, br);
} }
if (handler->state(id) != BreakpointInserted) {
br.lineNumber = breakData.value(
_("sourceLine")).toInt() + 1;
handler->setResponse(id, br);
handler->notifyBreakpointInsertOk(id);
}
} }
} }
} }