feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

s60devicerunconfiguration: remove useless code

Browse Source
This commit is contained in:
hjk
2011-01-07 20:15:03 +01:00
parent 27e3a1ddf5
commit 389ca25253
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -752,13 +752,6 @@ void S60DeviceRunControl::applicationRunFailedNotice(const QString &errorMessage
// ======== S60DeviceDebugRunControl // ======== S60DeviceDebugRunControl
static inline QString localExecutable(const S60DeviceRunConfiguration *rc)
{
if (const S60DeviceRunConfiguration *s60runConfig = qobject_cast<const S60DeviceRunConfiguration *>(rc))
return s60runConfig->localExecutableFileName();
return QString();
}
// Return symbol file which should co-exist with the executable. // Return symbol file which should co-exist with the executable.
// location in debug builds. This can be 'foo.sym' (ABLD) or 'foo.exe.sym' (Raptor) // location in debug builds. This can be 'foo.sym' (ABLD) or 'foo.exe.sym' (Raptor)
static inline QString symbolFileFromExecutable(const QString &executable) static inline QString symbolFileFromExecutable(const QString &executable)
@@ -802,7 +795,7 @@ static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceR
// Prefer the '*.sym' file over the '.exe', which should exist at the same // Prefer the '*.sym' file over the '.exe', which should exist at the same
// location in debug builds. This can be 'foo.exe' (ABLD) or 'foo.exe.sym' (Raptor) // location in debug builds. This can be 'foo.exe' (ABLD) or 'foo.exe.sym' (Raptor)
sp.symbolFileName = symbolFileFromExecutable(localExecutable(rc)); sp.symbolFileName = symbolFileFromExecutable(rc->localExecutableFileName());
return sp; return sp;
} }
@@ -812,7 +805,7 @@ S60DeviceDebugRunControl::S60DeviceDebugRunControl(S60DeviceRunConfiguration *rc
{ {
if (startParameters().symbolFileName.isEmpty()) { if (startParameters().symbolFileName.isEmpty()) {
const QString msg = tr("Warning: Cannot locate the symbol file belonging to %1."). const QString msg = tr("Warning: Cannot locate the symbol file belonging to %1.").
arg(localExecutable(rc)); arg(rc->localExecutableFileName());
appendMessage(msg, ErrorMessageFormat); appendMessage(msg, ErrorMessageFormat);
} }
} }