From 042e670c3c884517dd7b07920a85c9c5996add80 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 20 Nov 2024 15:07:07 +0100
Subject: [PATCH] Qnx: Inline QnxDebugSupport

Task-number: QTCREATORBUG-29168
Change-Id: I571f57d82df81ff019ecb458b38e2a5df8f5d244
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/qnx/qnxdebugsupport.cpp | 97 +++++++++++++----------------
 1 file changed, 45 insertions(+), 52 deletions(-)

diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index d9cda7b27dd..e949b5b9f38 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -70,57 +70,6 @@ static QStringList searchPaths(Kit *kit)
     return searchPaths;
 }
 
-// QnxDebugSupport
-
-class QnxDebugSupport : public Debugger::DebuggerRunTool
-{
-public:
-    explicit QnxDebugSupport(ProjectExplorer::RunControl *runControl)
-        : DebuggerRunTool(runControl)
-    {
-        setId("QnxDebugSupport");
-        appendMessage(Tr::tr("Preparing remote side..."), LogMessageFormat);
-
-        setUsePortsGatherer(isCppDebugging(), isQmlDebugging());
-
-        auto debuggeeRunner = new SimpleTargetRunner(runControl);
-        debuggeeRunner->setId("QnxDebuggeeRunner");
-
-        debuggeeRunner->setStartModifier([debuggeeRunner] {
-            CommandLine cmd = debuggeeRunner->commandLine();
-            QStringList arguments;
-            if (debuggeeRunner->usesDebugChannel()) {
-                const int pdebugPort = debuggeeRunner->debugChannel().port();
-                cmd.setExecutable(debuggeeRunner->device()->filePath(QNX_DEBUG_EXECUTABLE));
-                arguments.append(QString::number(pdebugPort));
-            }
-            if (debuggeeRunner->usesQmlChannel()) {
-                arguments.append(qmlDebugTcpArguments(QmlDebuggerServices, debuggeeRunner->qmlChannel()));
-            }
-            cmd.setArguments(ProcessArgs::joinArgs(arguments));
-            debuggeeRunner->setCommandLine(cmd);
-        });
-
-
-        auto slog2InfoRunner = new Slog2InfoRunner(runControl);
-        debuggeeRunner->addStartDependency(slog2InfoRunner);
-
-        addStartDependency(debuggeeRunner);
-
-        Kit *k = runControl->kit();
-
-        setStartMode(AttachToRemoteServer);
-        setCloseMode(KillAtClose);
-        setUseCtrlCStub(true);
-        setSolibSearchPath(FileUtils::toFilePathList(searchPaths(k)));
-        if (auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitAspect::qtVersion(k))) {
-            setSysRoot(qtVersion->qnxTarget());
-            modifyDebuggerEnvironment(qtVersion->environment());
-        }
-    }
-};
-
-
 // QnxAttachDebugDialog
 
 class QnxAttachDebugDialog : public DeviceProcessesDialog
@@ -220,7 +169,51 @@ class QnxDebugWorkerFactory final : public RunWorkerFactory
 public:
     QnxDebugWorkerFactory()
     {
-        setProduct<QnxDebugSupport>();
+        setProducer([](RunControl *runControl) {
+            auto debugger = new DebuggerRunTool(runControl);
+
+            debugger->setId("QnxDebugSupport");
+            debugger->appendMessage(Tr::tr("Preparing remote side..."), LogMessageFormat);
+
+            debugger->setupPortsGatherer();
+
+            auto debuggeeRunner = new SimpleTargetRunner(runControl);
+            debuggeeRunner->setId("QnxDebuggeeRunner");
+
+            debuggeeRunner->setStartModifier([debuggeeRunner] {
+                CommandLine cmd = debuggeeRunner->commandLine();
+                QStringList arguments;
+                if (debuggeeRunner->usesDebugChannel()) {
+                    const int pdebugPort = debuggeeRunner->debugChannel().port();
+                    cmd.setExecutable(debuggeeRunner->device()->filePath(QNX_DEBUG_EXECUTABLE));
+                    arguments.append(QString::number(pdebugPort));
+                }
+                if (debuggeeRunner->usesQmlChannel()) {
+                    arguments.append(qmlDebugTcpArguments(QmlDebuggerServices, debuggeeRunner->qmlChannel()));
+                }
+                cmd.setArguments(ProcessArgs::joinArgs(arguments));
+                debuggeeRunner->setCommandLine(cmd);
+            });
+
+
+            auto slog2InfoRunner = new Slog2InfoRunner(runControl);
+            debuggeeRunner->addStartDependency(slog2InfoRunner);
+
+            debugger->addStartDependency(debuggeeRunner);
+
+            Kit *k = runControl->kit();
+
+            debugger->setStartMode(AttachToRemoteServer);
+            debugger->setCloseMode(KillAtClose);
+            debugger->setUseCtrlCStub(true);
+            debugger->setSolibSearchPath(FileUtils::toFilePathList(searchPaths(k)));
+            if (auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitAspect::qtVersion(k))) {
+                debugger->setSysRoot(qtVersion->qnxTarget());
+                debugger->modifyDebuggerEnvironment(qtVersion->environment());
+            }
+
+            return debugger;
+        });
         addSupportedRunMode(ProjectExplorer::Constants::DEBUG_RUN_MODE);
         addSupportedRunConfig(Constants::QNX_RUNCONFIG_ID);
     }