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

debugger: try to reduce s60devicerunconfiguration dependencies

Browse Source
This commit is contained in:
hjk
2011-01-06 18:34:29 +01:00
parent 3b92aab215
commit 2525ff3c71
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -777,12 +777,13 @@ static inline QString symbolFileFromExecutable(const QString &executable)
} }
// Create start parameters from run configuration // Create start parameters from run configuration
Debugger::DebuggerStartParameters S60DeviceDebugRunControl::s60DebuggerStartParams(const S60DeviceRunConfiguration *rc) static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceRunConfiguration *rc)
{ {
Debugger::DebuggerStartParameters sp; Debugger::DebuggerStartParameters sp;
QTC_ASSERT(rc, return sp); QTC_ASSERT(rc, return sp);
const S60DeployConfiguration *activeDeployConf = qobject_cast<S60DeployConfiguration *>(rc->qt4Target()->activeDeployConfiguration()); const S60DeployConfiguration *activeDeployConf =
qobject_cast<S60DeployConfiguration *>(rc->qt4Target()->activeDeployConfiguration());
const QString debugFileName = QString::fromLatin1("%1:\\sys\\bin\\%2.exe") const QString debugFileName = QString::fromLatin1("%1:\\sys\\bin\\%2.exe")
.arg(activeDeployConf->installationDrive()).arg(rc->targetName()); .arg(activeDeployConf->installationDrive()).arg(rc->targetName());
@@ -804,8 +805,7 @@ Debugger::DebuggerStartParameters S60DeviceDebugRunControl::s60DebuggerStartPara
S60DeviceDebugRunControl::S60DeviceDebugRunControl(S60DeviceRunConfiguration *rc, S60DeviceDebugRunControl::S60DeviceDebugRunControl(S60DeviceRunConfiguration *rc,
const QString &) : const QString &) :
Debugger::DebuggerRunControl(rc, Debugger::GdbEngineType, Debugger::DebuggerRunControl(rc, Debugger::GdbEngineType, s60DebuggerStartParams(rc))
S60DeviceDebugRunControl::s60DebuggerStartParams(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.").
@@ -832,7 +832,3 @@ void S60DeviceDebugRunControl::start()
emit appendMessage(this, tr("Launching debugger..."), false); emit appendMessage(this, tr("Launching debugger..."), false);
Debugger::DebuggerRunControl::start(); Debugger::DebuggerRunControl::start();
} }
S60DeviceDebugRunControl::~S60DeviceDebugRunControl()
{
}

4
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View File

@@ -203,11 +203,7 @@ class S60DeviceDebugRunControl : public Debugger::DebuggerRunControl
public: public:
explicit S60DeviceDebugRunControl(S60DeviceRunConfiguration *runConfiguration, explicit S60DeviceDebugRunControl(S60DeviceRunConfiguration *runConfiguration,
const QString &mode); const QString &mode);
virtual ~S60DeviceDebugRunControl();
virtual void start(); virtual void start();
private:
static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceRunConfiguration *rc);
}; };
} // namespace Internal } // namespace Internal