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

ProjectExplorer: Move PortsGatherer to RunControl

Browse Source 
The PortsGatherer runworker was used in all remote setups plus local QML
tooling and injected in various ways into the tree of runworkers.

Having this centrally reduces complexity downstream.

Change-Id: I8e08a942209f5458fbdd5c9e286d05979beb8a40
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2024-09-30 09:08:43 +02:00
parent 8b86527218
commit 49db4beb7d
8 changed files with 66 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -756,6 +756,7 @@ bool DebuggerRunTool::isQmlDebugging() const
void DebuggerRunTool::setUsePortsGatherer(bool useCpp, bool useQml)
{
QTC_ASSERT(!d->portsGatherer, reportFailure(); return);
runControl()->enablePortsGatherer();
d->portsGatherer = new DebugServerPortsGatherer(runControl());
d->portsGatherer->setUseGdbServer(useCpp);
d->portsGatherer->setUseQmlServer(useQml);
@@ -1040,9 +1041,8 @@ namespace Internal {
class SubChannelProvider : public RunWorker
{
public:
SubChannelProvider(RunControl *runControl, PortsGatherer *portsGatherer)
SubChannelProvider(RunControl *runControl)
: RunWorker(runControl)
, m_portGatherer(portsGatherer)
{
setId("SubChannelProvider");
}
@@ -1054,8 +1054,7 @@ public:
m_channel.setHost("localhost");
else
m_channel.setHost(device()->toolControlChannel(IDevice::ControlChannelHint()).host());
if (m_portGatherer)
m_channel.setPort(m_portGatherer->findEndPoint().port());
m_channel.setPort(runControl()->findEndPoint().port());
reportStarted();
}
@@ -1063,7 +1062,6 @@ public:
private:
QUrl m_channel;
PortsGatherer *m_portGatherer = nullptr;
};
} // Internal
@@ -1108,12 +1106,11 @@ DebugServerPortsGatherer::DebugServerPortsGatherer(RunControl *runControl)
: RunWorker(runControl)
{
setId("DebugServerPortsGatherer");
auto portsGatherer = new PortsGatherer(runControl);
m_gdbChannelProvider = new Internal::SubChannelProvider(runControl, portsGatherer);
m_gdbChannelProvider = new Internal::SubChannelProvider(runControl);
addStartDependency(m_gdbChannelProvider);
m_qmlChannelProvider = new Internal::SubChannelProvider(runControl, portsGatherer);
m_qmlChannelProvider = new Internal::SubChannelProvider(runControl);
addStartDependency(m_qmlChannelProvider);
}