From 8fdbbccf3fda998c145a3ebd03cc29c5efd79881 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 29 Nov 2022 17:05:10 +0100 Subject: [PATCH] SubChannelProvider: Pass PortsGatherer I've cut a bit too much in the previous commit. Bring back passing ports gatherer into SubChannelProvider. Amends 302268c4d4431d7311500419347163fc78d5a904 Change-Id: I5bf79300c7930348495757e3f9e4ab164512860e Reviewed-by: hjk --- .../devicesupport/deviceusedportsgatherer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp index 6acefeee382..acca112ae82 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp @@ -183,8 +183,9 @@ namespace Internal { class SubChannelProvider : public RunWorker { public: - SubChannelProvider(RunControl *runControl) + SubChannelProvider(RunControl *runControl, PortsGatherer *portsGatherer) : RunWorker(runControl) + , m_portGatherer(portsGatherer) { setId("SubChannelProvider"); } @@ -243,9 +244,10 @@ ChannelProvider::ChannelProvider(RunControl *runControl, int requiredChannels) : RunWorker(runControl) { setId("ChannelProvider"); + auto portsGatherer = new PortsGatherer(runControl); for (int i = 0; i < requiredChannels; ++i) { - auto channelProvider = new Internal::SubChannelProvider(runControl); + auto channelProvider = new Internal::SubChannelProvider(runControl, portsGatherer); m_channelProviders.append(channelProvider); addStartDependency(channelProvider); }