From fc35bab3af690621a9b43e6c167e3f791f31859c Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 20 Nov 2024 16:03:50 +0100
Subject: [PATCH] WebAssembly: Inline class EmrunRunWorker

Task-number: QTCREATORBUG-29168
Change-Id: I2ee076c06cf62370ff2aeaffbc4bbd0318cbf617
Reviewed-by: hjk <hjk@qt.io>
---
 .../webassemblyrunconfiguration.cpp           | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.cpp b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
index 62d96ae5f6d..def5b1c54c5 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
@@ -199,26 +199,6 @@ private:
     StringAspect effectiveEmrunCall{this};
 };
 
-class EmrunRunWorker : public SimpleTargetRunner
-{
-public:
-    EmrunRunWorker(RunControl *runControl)
-        : SimpleTargetRunner(runControl)
-    {
-        runControl->requestWorkerChannel();
-
-        setStartModifier([this, runControl] {
-            const QString browserId =
-                    runControl->aspectData<WebBrowserSelectionAspect>()->currentBrowser;
-            setCommandLine(emrunCommand(runControl->target(),
-                                        runControl->buildKey(),
-                                        browserId,
-                                        QString::number(runControl->workerChannel().port())));
-            setEnvironment(runControl->buildEnvironment());
-        });
-    }
-};
-
 // Factories
 
 class EmrunRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory
@@ -236,7 +216,20 @@ class EmrunRunWorkerFactory final : public ProjectExplorer::RunWorkerFactory
 public:
     EmrunRunWorkerFactory()
     {
-        setProduct<EmrunRunWorker>();
+        setProducer([](RunControl *runControl) {
+            auto worker = new SimpleTargetRunner(runControl);
+            runControl->requestWorkerChannel();
+
+            worker->setStartModifier([worker, runControl] {
+                const QString browserId =
+                    runControl->aspectData<WebBrowserSelectionAspect>()->currentBrowser;
+                worker->setCommandLine(emrunCommand(runControl->target(), runControl->buildKey(),
+                    browserId, QString::number(runControl->workerChannel().port())));
+                worker->setEnvironment(runControl->buildEnvironment());
+            });
+
+            return worker;
+        });
         addSupportedRunMode(ProjectExplorer::Constants::NORMAL_RUN_MODE);
         addSupportedRunConfig(Constants::WEBASSEMBLY_RUNCONFIGURATION_EMRUN);
     }