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

RemoteLinux: Use the optional PortGatherer from the DebuggerRunTool

Browse Source 
Change-Id: I4a79abff197ea72df421fbafe11823480719f4a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2017-10-19 14:24:33 +02:00
parent f521b2428d
commit f1a4a10cfe
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,12 +39,11 @@ LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl)
{ {
setDisplayName("LinuxDeviceDebugSupport"); setDisplayName("LinuxDeviceDebugSupport");
m_portsGatherer = new GdbServerPortsGatherer(runControl); setUsePortsGatherer(isCppDebugging(), isQmlDebugging());
m_portsGatherer->setUseGdbServer(isCppDebugging()); addQmlServerInferiorCommandLineArgumentIfNeeded();
m_portsGatherer->setUseQmlServer(isQmlDebugging());
auto gdbServer = new GdbServerRunner(runControl, m_portsGatherer); auto gdbServer = new GdbServerRunner(runControl, portsGatherer());
gdbServer->addStartDependency(m_portsGatherer); gdbServer->addStartDependency(portsGatherer());
addStartDependency(gdbServer); addStartDependency(gdbServer);
@@ -59,14 +58,5 @@ LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl)
setSymbolFile(rlrc->localExecutableFilePath()); setSymbolFile(rlrc->localExecutableFilePath());
} }
void LinuxDeviceDebugSupport::start()
{
setRemoteChannel(m_portsGatherer->gdbServerChannel());
setQmlServer(m_portsGatherer->qmlServer());
addQmlServerInferiorCommandLineArgumentIfNeeded();
DebuggerRunTool::start();
}
} // namespace Internal } // namespace Internal
} // namespace RemoteLinux } // namespace RemoteLinux

5
src/plugins/remotelinux/remotelinuxdebugsupport.h
View File

@@ -34,11 +34,6 @@ class LinuxDeviceDebugSupport : public Debugger::DebuggerRunTool
{ {
public: public:
LinuxDeviceDebugSupport(ProjectExplorer::RunControl *runControl); LinuxDeviceDebugSupport(ProjectExplorer::RunControl *runControl);
private:
void start() override;
Debugger::GdbServerPortsGatherer *m_portsGatherer = nullptr;
}; };
} // namespace Internal } // namespace Internal