Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

d898dc02 · Friedemann Kleint · 47696edc · 4b4901b7 · d898dc02
Commit d898dc02 authored Jun 30, 2009 by Friedemann Kleint
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

src/plugins/debugger/gdb/gdbengine.cpp src/plugins/debugger/gdb/gdbengine.cpp +2 -1

No files found.
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1539,7 +1539,8 @@ bool GdbEngine::startDebugger(const QSharedPointer<DebuggerStartParameters> &sp)

    if (q->startMode() == AttachExternal || q->startMode() == AttachCrashedExternal) {
        postCommand(_("attach %1").arg(sp->attachPID), CB(handleAttach));
-        qq->breakHandler()->removeAllBreakpoints();
+        // Task 254674 does not want to remove them
+        //qq->breakHandler()->removeAllBreakpoints();
    } else if (q->startMode() == AttachCore) {
        QFileInfo fi(sp->executable);
        QString fileName = _c('"') + fi.absoluteFilePath() + _c('"');