Ios: Merge 2 workers into one recipeHEADmaster

Task-number: QTCREATORBUG-29168
Change-Id: I9f7ed2a2ecbf4aa5c40184be7a21791a1c6ce2c0
Reviewed-by: Eike Ziller <[email protected]>

1 files changed, 6 insertions, 7 deletions

diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index c03da3e6c49..d6240cf14e5 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -665,13 +665,14 @@ static Group iosToolKicker(const StoredBarrier &barrier, RunControl *runControl,
     };
 }
 
-static Group iosToolRecipe(RunControl *runControl, const DebugInfo &debugInfo = {})
+static Group iosToolRecipe(RunControl *runControl, const DebugInfo &debugInfo = {},
+                           const std::optional<ExecutableItem> &afterStartedRecipe = {})
 {
     const auto kicker = [runControl, debugInfo](const StoredBarrier &barrier) {
         return iosToolKicker(barrier, runControl, debugInfo);
     };
     return When (kicker) >> Do {
-        Sync([] { emit runStorage()->started(); })
+        afterStartedRecipe ? *afterStartedRecipe : Sync([] { emit runStorage()->started(); })
     };
 }
 
@@ -884,12 +885,10 @@ public:
     IosQmlProfilerWorkerFactory()
     {
         setId("IosQmlProfilerWorkerFactory");
-        setProducer([](RunControl *runControl) {
-            auto runner = new RunWorker(runControl, iosToolRecipe(runControl, {QmlProfilerServices}));
+        setRecipeProducer([](RunControl *runControl) {
             runControl->requestQmlChannel();
-            auto profiler = runControl->createWorker(ProjectExplorer::Constants::QML_PROFILER_RUNNER);
-            profiler->addStartDependency(runner);
-            return profiler;
+            return iosToolRecipe(runControl, {QmlProfilerServices},
+                                 runControl->createRecipe(ProjectExplorer::Constants::QML_PROFILER_RUNNER));
         });
         addSupportedRunMode(ProjectExplorer::Constants::QML_PROFILER_RUN_MODE);
         addSupportedRunConfig(Constants::IOS_RUNCONFIG_ID);