From 6259789b8d5d3a05f90d29774249a1af68e8aa4d Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 22 Sep 2009 11:54:28 +0200
Subject: [PATCH] debugger: compile/link fixes

---
 src/plugins/debugger/gdb/gdbengine.cpp       | 3 ++-
 src/plugins/debugger/gdb/plaingdbadapter.cpp | 7 +++++++
 src/plugins/debugger/gdb/trkgdbadapter.cpp   | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 6f369baa8e6..9af66c5edf6 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -297,7 +297,8 @@ void GdbEngine::gdbProcError(QProcess::ProcessError error)
                 "invoked program '%1' is missing, or you may have insufficient "
                 "permissions to invoke the program.")
                 .arg(theDebuggerStringSetting(GdbLocation));
-            emitStartFailed();
+            emit startFailed();
+            shutdown();
             break;
         case QProcess::Crashed:
             kill = false;
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index 851c5edb1d2..f29def0afdf 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -216,6 +216,13 @@ void PlainGdbAdapter::handleExecRun(const GdbResultRecord &response, const QVari
     }
 }
 
+void PlainGdbAdapter::startInferior()
+{
+    QTC_ASSERT(state() == InferiorPrepared, qDebug() << state());
+    setState(InferiorStarting);
+    m_engine->postCommand(_("-exec-run"), CB(handleExecRun));
+}
+
 void PlainGdbAdapter::interruptInferior()
 {
     debugMessage(_("TRYING TO INTERUPT INFERIOR"));
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index 9be95bf8273..acb296d50e5 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -32,7 +32,9 @@
 #ifndef STANDALONE_RUNNER
 #include "gdbengine.h"
 #endif
-#ifndef Q_OS_WIN
+#ifdef Q_OS_WIN
+#  include <windows.h>
+#else
 #  include <sys/types.h>
 #  include <unistd.h>
 #endif