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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	doc/templates/style/style.css
	qtcreator.pri

Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d
This commit is contained in:
Eike Ziller
2012-04-27 17:02:39 +02:00
parent 6c5bec6e65 29062c64f7
commit 9092e70884
28 changed files with 735 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3126,20 +3126,22 @@ void GdbEngine::insertBreakpoint(BreakpointModelId id)
QVariant vid = QVariant::fromValue(id);
if (type == WatchpointAtAddress) {
postCommand("watch " + addressSpec(handler->address(id)),
NeedsStop | RebuildBreakpointModel,
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleWatchInsert), vid);
return;
}
if (type == WatchpointAtExpression) {
postCommand("watch " + handler->expression(id).toLocal8Bit(),
NeedsStop | RebuildBreakpointModel,
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleWatchInsert), vid);
return;
}
if (type == BreakpointAtFork) {
postCommand("catch fork", NeedsStop | RebuildBreakpointModel,
postCommand("catch fork",
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleCatchInsert), vid);
postCommand("catch vfork", NeedsStop | RebuildBreakpointModel,
postCommand("catch vfork",
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleCatchInsert), vid);
return;
}
@@ -3149,12 +3151,14 @@ void GdbEngine::insertBreakpoint(BreakpointModelId id)
// return;
//}
if (type == BreakpointAtExec) {
postCommand("catch exec", NeedsStop | RebuildBreakpointModel,
postCommand("catch exec",
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleCatchInsert), vid);
return;
}
if (type == BreakpointAtSysCall) {
postCommand("catch syscall", NeedsStop | RebuildBreakpointModel,
postCommand("catch syscall",
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleCatchInsert), vid);
return;
}