From 5ddbd55e6ef0a50c318af360e0ecfab12bff0c85 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 14 Dec 2009 02:41:51 +0000
Subject: * Fixed gcc4.4 compilation issues * Repaired malfunctioning debug
 configuration dialog that prevented execution of gdb

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1062175 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 languages/cpp/debugger/debuggerconfigwidget.cpp | 14 +-------------
 lib/antlr/antlr/CharScanner.hpp                 |  1 +
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp
index 93e52e64..11de247f 100644
--- a/languages/cpp/debugger/debuggerconfigwidget.cpp
+++ b/languages/cpp/debugger/debuggerconfigwidget.cpp
@@ -37,19 +37,7 @@ DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, QWidget *parent,
     QString shell =             DomUtil::readEntry(dom, "/kdevdebugger/general/dbgshell","no_value");
     if( shell == QString("no_value") )
     {
-        QFileInfo info( part->project()->buildDirectory() + "/libtool" );
-        if( info.exists() ) {
-            shell = "libtool";
-        } else {
-            // Try one directory up.
-            info.setFile( part->project()->buildDirectory() + "/../libtool" );
-            if( info.exists() ) {
-                shell = "../libtool";
-            } else {
-                // Give up.
-                shell = QString::null;
-            }
-        }
+	shell = QString::null;
     }
     debuggingShell_edit->setURL( shell );
 
diff --git a/lib/antlr/antlr/CharScanner.hpp b/lib/antlr/antlr/CharScanner.hpp
index c426eba2..f7e58520 100644
--- a/lib/antlr/antlr/CharScanner.hpp
+++ b/lib/antlr/antlr/CharScanner.hpp
@@ -18,6 +18,7 @@
 #include <cctype>
 #endif
 #include <cstring>
+#include <cstdio>
 
 #if ( _MSC_VER == 1200 )
 // VC6 seems to need this
-- 
cgit v1.2.3