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

Fixes: Compile

Browse Source
This commit is contained in:
dt
2009-03-11 12:07:05 +01:00
parent c395680eb6
commit caf86a8c27
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/gdbengine.cpp
View File

@@ -1298,12 +1298,8 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
frame.findChild("func").data() + '%'; frame.findChild("func").data() + '%';
QApplication::alert(q->mainWindow(), 3000); QApplication::alert(q->mainWindow(), 3000);
<<<<<<< HEAD:src/plugins/debugger/gdbengine.cpp
//reloadSourceFiles();
=======
if (qq->wantsSourceFileList()) if (qq->wantsSourceFileList())
reloadSourceFiles(); reloadSourceFiles();
>>>>>>> c0b1386361695fca7865a79af193c74c3d2ac495:src/plugins/debugger/gdbengine.cpp
sendCommand("-break-list", BreakList); sendCommand("-break-list", BreakList);
QVariant var = QVariant::fromValue<GdbMi>(data); QVariant var = QVariant::fromValue<GdbMi>(data);
sendCommand("p 0", GdbAsyncOutput2, var); // dummy sendCommand("p 0", GdbAsyncOutput2, var); // dummy