From e0743503d1bb81933fedad7f1e4c1eaf5fa3cd1b Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 20 Nov 2024 19:12:52 +0100 Subject: [PATCH] Android: Inline AndroidQmlToolingSupport Task-number: QTCREATORBUG-29168 Change-Id: I6211d9f864247fbcf0f4714ee45879a360b9c74b Reviewed-by: hjk --- .../android/androidqmltoolingsupport.cpp | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/plugins/android/androidqmltoolingsupport.cpp b/src/plugins/android/androidqmltoolingsupport.cpp index 8070dbb57a5..7d37027bf1b 100644 --- a/src/plugins/android/androidqmltoolingsupport.cpp +++ b/src/plugins/android/androidqmltoolingsupport.cpp @@ -13,27 +13,22 @@ using namespace ProjectExplorer; namespace Android::Internal { -class AndroidQmlToolingSupport final : public RunWorker -{ -public: - explicit AndroidQmlToolingSupport(RunControl *runControl) : RunWorker(runControl) - { - setId("AndroidQmlToolingSupport"); - - auto runner = new AndroidRunner(runControl); - addStartDependency(runner); - - auto worker = runControl->createWorker(runnerIdForRunMode(runControl->runMode())); - worker->addStartDependency(this); - } -}; - class AndroidQmlToolingSupportFactory final : public RunWorkerFactory { public: AndroidQmlToolingSupportFactory() { - setProduct(); + setProducer([](RunControl *runControl) { + auto worker = new RunWorker(runControl); + worker->setId("AndroidQmlToolingSupport"); + + auto runner = new AndroidRunner(runControl); + worker->addStartDependency(runner); + + auto extraWorker = runControl->createWorker(runnerIdForRunMode(runControl->runMode())); + extraWorker->addStartDependency(worker); + return worker; + }); addSupportedRunMode(ProjectExplorer::Constants::QML_PROFILER_RUN_MODE); addSupportedRunConfig(Constants::ANDROID_RUNCONFIG_ID); }