* 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
v3.5.13-sru
tpearson 15 years ago
parent 114a878c64
commit 5ddbd55e6e

@ -37,19 +37,7 @@ DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, QWidget *parent,
QString shell = DomUtil::readEntry(dom, "/kdevdebugger/general/dbgshell","no_value"); QString shell = DomUtil::readEntry(dom, "/kdevdebugger/general/dbgshell","no_value");
if( shell == QString("no_value") ) if( shell == QString("no_value") )
{ {
QFileInfo info( part->project()->buildDirectory() + "/libtool" ); shell = QString::null;
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;
}
}
} }
debuggingShell_edit->setURL( shell ); debuggingShell_edit->setURL( shell );

@ -18,6 +18,7 @@
#include <cctype> #include <cctype>
#endif #endif
#include <cstring> #include <cstring>
#include <cstdio>
#if ( _MSC_VER == 1200 ) #if ( _MSC_VER == 1200 )
// VC6 seems to need this // VC6 seems to need this

Loading…
Cancel
Save