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

debugger: fix manual changing of breakpoint line numbers

Browse Source 
Task-number: QTCREATORBUG-6178
Change-Id: I3e0a3cae0ee5df02ad8ceee7222bc667e61774c8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-11-04 14:03:48 +01:00
committed by hjk
parent b0ca56109e
commit ccfc4e032a
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/debugger/breakhandler.cpp
View File

@@ -1230,7 +1230,6 @@ void BreakHandler::gotoLocation(BreakpointModelId id) const
void BreakHandler::updateLineNumberFromMarker(BreakpointModelId id, int lineNumber)
{
Iterator it = m_storage.find(id);
it->response.pending = false;
BREAK_ASSERT(it != m_storage.end(), return);
// Ignore updates to the "real" line number while the debugger is
// running, as this can be triggered by moving the breakpoint to
@@ -1241,10 +1240,6 @@ void BreakHandler::updateLineNumberFromMarker(BreakpointModelId id, int lineNumb
it->data.lineNumber += lineNumber - it->response.lineNumber;
else
it->data.lineNumber = lineNumber;
if (it->response.lineNumber != lineNumber) {
// FIXME: Should we tell gdb about the change?
it->response.lineNumber = lineNumber;
}
it->updateMarker(id);
emit layoutChanged();
}
@@ -1335,11 +1330,10 @@ void BreakHandler::changeBreakpointData(BreakpointModelId id,
if (data == it->data)
return;
it->data = data;
if (parts == NoParts) {
it->destroyMarker();
it->updateMarker(id);
layoutChanged();
} else if (it->needsChange() && it->engine && it->state != BreakpointNew) {
it->destroyMarker();
it->updateMarker(id);
layoutChanged();
if (it->needsChange() && it->engine && it->state != BreakpointNew) {
setState(id, BreakpointChangeRequested);
scheduleSynchronization();
}
@@ -1411,6 +1405,8 @@ bool BreakHandler::BreakpointItem::needsChange() const
return true;
if (data.command != response.command)
return true;
if (data.lineNumber != response.lineNumber)
return true;
return false;
}