From 70b3c729cfb13a7a59851fc31fa3644d412a5a9e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 8 Oct 2009 12:31:17 +0200
Subject: [PATCH] fix build after mismerge

---
 src/plugins/debugger/gdb/plaingdbadapter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index 3773e0a9f82..5d679527aa4 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -77,7 +77,7 @@ void PlainGdbAdapter::startAdapter()
 
     if (!m_outputCollector.listen()) {
         emit adapterStartFailed(tr("Cannot set up communication with child process: %1")
-                .arg(m_outputCollector.errorString()));
+                .arg(m_outputCollector.errorString()), QString());
         return;
     }
     gdbArgs.prepend(_("--tty=") + m_outputCollector.serverName());