Debugger: Transform DebuggerRunParameters::deviceSymbolsRoot

Task-number: QTCREATORBUG-29168
Change-Id: Iad164b9c37cdced6b823da976be8bc87aa97dcb1
Reviewed-by: hjk <hjk@qt.io>

src/plugins/debugger/debuggerengine.h

@@ -153,7 +153,11 @@ public:
     void setLldbPlatform(const QString &platform) { m_lldbPlatform = platform; }
     QString lldbPlatform() const { return m_lldbPlatform; }
 
-    QString deviceSymbolsRoot;
+    void setDeviceSymbolsRoot(const QString &deviceSymbolsRoot) {
+        m_deviceSymbolsRoot = deviceSymbolsRoot;
+    }
+    QString deviceSymbolsRoot() const { return m_deviceSymbolsRoot; }
+
     bool continueAfterAttach = false;
     Utils::FilePath sysRoot;
     // iOS 17+
@@ -256,6 +260,8 @@ private:
     Utils::FilePaths m_additionalSearchDirectories;
 
     QString m_lldbPlatform;
+
+    QString m_deviceSymbolsRoot;
 };
 
 namespace Internal {

src/plugins/debugger/debuggerruncontrol.cpp

@@ -128,11 +128,6 @@ void DebuggerRunTool::setDebugInfoLocation(const FilePath &debugInfoLocation)
     m_runParameters.debugInfoLocation = debugInfoLocation;
 }
 
-void DebuggerRunTool::setDeviceSymbolsRoot(const QString &deviceSymbolsRoot)
-{
-    m_runParameters.deviceSymbolsRoot = deviceSymbolsRoot;
-}
-
 void DebuggerRunTool::setDeviceUuid(const QString &uuid)
 {
     m_runParameters.deviceUuid = uuid;

src/plugins/debugger/debuggerruncontrol.h

@@ -62,7 +62,6 @@ public:
 
     void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item);
 
-    void setDeviceSymbolsRoot(const QString &deviceSymbolsRoot);
     void setDeviceUuid(const QString &uuid);
 
     void setAbi(const ProjectExplorer::Abi &abi);

src/plugins/debugger/lldb/lldbengine.cpp

@@ -308,8 +308,8 @@ void LldbEngine::handleLldbStarted()
                 && (rp.startMode() == AttachToRemoteProcess || rp.startMode() == AttachToLocalProcess
                     || rp.startMode() == AttachToRemoteServer || rp.startMode() == AttachToIosDevice));
             cmd2.arg("attachpid", rp.attachPid().pid());
-            cmd2.arg("sysroot", rp.deviceSymbolsRoot.isEmpty() ? rp.sysRoot.toUrlishString()
+            cmd2.arg("sysroot", rp.deviceSymbolsRoot().isEmpty() ? rp.sysRoot.toUrlishString()
-                                                               : rp.deviceSymbolsRoot);
+                                                                 : rp.deviceSymbolsRoot());
             cmd2.arg("remotechannel", ((rp.startMode() == AttachToRemoteProcess
                                         || rp.startMode() == AttachToRemoteServer)
                                            ? rp.remoteChannel() : QString()));

src/plugins/ios/iosrunner.cpp

@@ -936,7 +936,7 @@ IosDebugSupport::IosDebugSupport(RunControl *runControl)
         if (!deviceSdk)
             TaskHub::addTask(DeploymentTask(Task::Warning, deviceSdk.error()));
         else
-            setDeviceSymbolsRoot(deviceSdk->path());
+            rp.setDeviceSymbolsRoot(deviceSdk->path());
     } else {
         rp.setStartMode(AttachToLocalProcess);
         rp.setLldbPlatform("ios-simulator");