From caf86a8c2752c52848d441bef0458cd15bbab49c Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Wed, 11 Mar 2009 12:07:05 +0100
Subject: [PATCH] Fixes: Compile
---
src/plugins/debugger/gdbengine.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp
index ac10f32030c..65c991768ae 100644
--- a/src/plugins/debugger/gdbengine.cpp
+++ b/src/plugins/debugger/gdbengine.cpp
@@ -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
--
GitLab