Commit caf86a8c authored by dt's avatar dt
Browse files

Fixes: Compile

parent c395680e
......@@ -1298,12 +1298,8 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
frame.findChild("func").data() + '%';
QApplication::alert(q->mainWindow(), 3000);
<<<<<<< HEAD:src/plugins/debugger/gdbengine.cpp
//reloadSourceFiles();
=======
if (qq->wantsSourceFileList())
reloadSourceFiles();
>>>>>>> c0b1386361695fca7865a79af193c74c3d2ac495:src/plugins/debugger/gdbengine.cpp
sendCommand("-break-list", BreakList);
QVariant var = QVariant::fromValue<GdbMi>(data);
sendCommand("p 0", GdbAsyncOutput2, var); // dummy
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment