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

RemoteLinux: Prepare for downstream Qdb adaptations

Browse Source 
Change-Id: Ie00eb97cd0aeaf8eac193ead3048c180fe39808e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2017-06-23 13:31:31 +02:00
parent c6771c39c1
commit e797f41759
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
View File

@@ -50,7 +50,7 @@ namespace RemoteLinux {
LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl)
: DebuggerRunTool(runControl)
{
setDisplayName("DebugSupport");
setDisplayName("LinuxDeviceDebugSupport");
auto portsGatherer = new GdbServerPortsGatherer(runControl);
portsGatherer->setUseGdbServer(isCppDebugging());
@@ -60,14 +60,21 @@ LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl)
gdbServer->addDependency(portsGatherer);
addDependency(gdbServer);
}
LinuxDeviceDebugSupport::~LinuxDeviceDebugSupport()
{
RunConfiguration *runConfig = runControl->runConfiguration();
if (auto rlrc = qobject_cast<RemoteLinuxRunConfiguration *>(runConfig))
m_symbolFile = rlrc->localExecutableFilePath();
else if (auto rlrc = qobject_cast<Internal::RemoteLinuxCustomRunConfiguration *>(runConfig))
m_symbolFile = rlrc->localExecutableFilePath();
}
void LinuxDeviceDebugSupport::start()
{
if (m_symbolFile.isEmpty()) {
reportFailure(tr("Cannot debug: Local executable is not set."));
return;
}
auto portsGatherer = runControl()->worker<GdbServerPortsGatherer>();
QTC_ASSERT(portsGatherer, reportFailure(); return);
@@ -75,18 +82,6 @@ void LinuxDeviceDebugSupport::start()
const Port gdbServerPort = portsGatherer->gdbServerPort();
const Port qmlServerPort = portsGatherer->qmlServerPort();
RunConfiguration *runConfig = runControl()->runConfiguration();
QString symbolFile;
if (auto rlrc = qobject_cast<RemoteLinuxRunConfiguration *>(runConfig))
symbolFile = rlrc->localExecutableFilePath();
if (auto rlrc = qobject_cast<Internal::RemoteLinuxCustomRunConfiguration *>(runConfig))
symbolFile = rlrc->localExecutableFilePath();
if (symbolFile.isEmpty()) {
// *errorMessage = tr("Cannot debug: Local executable is not set.");
return;
}
DebuggerStartParameters params;
params.startMode = AttachToRemoteServer;
params.closeMode = KillAndExitMonitorAtClose;
@@ -111,7 +106,7 @@ void LinuxDeviceDebugSupport::start()
}
params.remoteChannel = QString("%1:%2").arg(host).arg(gdbServerPort.number());
params.symbolFile = symbolFile;
params.symbolFile = m_symbolFile;
}
setStartParameters(params);