diff options
author | Jarek Kobus <[email protected]> | 2025-06-27 11:44:50 +0200 |
---|---|---|
committer | Jarek Kobus <[email protected]> | 2025-07-04 07:47:18 +0000 |
commit | cb2df7b0934b750c7212b317675ea0e02dfee37a (patch) | |
tree | f8fd0f0a83d96ca5fa8219cb76bacffb448b128e | |
parent | 4e94fa5189dfcf883ab3e067562ad3ec6498a7b4 (diff) |
Task-number: QTCREATORBUG-29168
Change-Id: Ib86f1060cf3ccd529b9238ef4509148ba7f1ea1c
Reviewed-by: hjk <[email protected]>
-rw-r--r-- | src/plugins/projectexplorer/runcontrol.cpp | 45 | ||||
-rw-r--r-- | src/plugins/projectexplorer/runcontrol.h | 3 |
2 files changed, 2 insertions, 46 deletions
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index 75f4a462751..0f1d0196078 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -213,8 +213,6 @@ public: const QPointer<RunControl> runControl; TaskTreeRunner taskTreeRunner; const Group recipe; - QList<RunWorker *> startDependencies; - QList<RunWorker *> stopDependencies; }; class RunControlPrivateData @@ -884,21 +882,6 @@ void RunControlPrivate::onWorkerStopped(RunWorker *worker) return; } - for (RunWorker *dependent : std::as_const(worker->d->stopDependencies)) { - switch (dependent->d->state) { - case RunState::Done: - break; - case RunState::Initialized: - dependent->d->state = RunState::Done; - break; - default: - debugMessage("Killing dependent worker"); - dependent->d->state = RunState::Canceled; - QTimer::singleShot(0, dependent, &RunWorker::initiateStop); - break; - } - } - debugMessage("Checking whether all stopped"); bool allDone = true; for (RunWorker *worker : std::as_const(m_workers)) { @@ -1439,26 +1422,12 @@ RunWorkerPrivate::RunWorkerPrivate(RunWorker *runWorker, RunControl *runControl, bool RunWorkerPrivate::canStart() const { - if (state != RunState::Initialized) - return false; - for (RunWorker *worker : startDependencies) { - QTC_ASSERT(worker, continue); - if (worker->d->state != RunState::Done && worker->d->state != RunState::Running) - return false; - } - return true; + return state == RunState::Initialized; } bool RunWorkerPrivate::canStop() const { - if (state != RunState::Starting && state != RunState::Running) - return false; - for (RunWorker *worker : stopDependencies) { - QTC_ASSERT(worker, continue); - if (worker->d->state != RunState::Done) - return false; - } - return true; + return state == RunState::Starting || state == RunState::Running; } /*! @@ -1549,16 +1518,6 @@ void RunWorker::initiateStop() emit canceled(); } -void RunWorker::addStartDependency(RunWorker *dependency) -{ - d->startDependencies.append(dependency); -} - -void RunWorker::addStopDependency(RunWorker *dependency) -{ - d->stopDependencies.append(dependency); -} - // Output parser factories static QList<std::function<OutputLineParser *(BuildConfiguration *)>> g_outputParserFactories; diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h index 7ed00660f82..f7921c6f433 100644 --- a/src/plugins/projectexplorer/runcontrol.h +++ b/src/plugins/projectexplorer/runcontrol.h @@ -46,9 +46,6 @@ public: explicit RunWorker(RunControl *runControl, const Tasking::Group &recipe); ~RunWorker() override; - void addStartDependency(RunWorker *dependency); - void addStopDependency(RunWorker *dependency); - signals: void canceled(); |