From 6d5d413bdebd094f3b3248d6b88aee0682b44443 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 10 Jan 2025 14:14:45 +0100 Subject: [PATCH] Debugger: Transform DebuggerRunParameters::deviceSymbolsRoot Task-number: QTCREATORBUG-29168 Change-Id: Iad164b9c37cdced6b823da976be8bc87aa97dcb1 Reviewed-by: hjk --- src/plugins/debugger/debuggerengine.h | 8 +++++++- src/plugins/debugger/debuggerruncontrol.cpp | 5 ----- src/plugins/debugger/debuggerruncontrol.h | 1 - src/plugins/debugger/lldb/lldbengine.cpp | 4 ++-- src/plugins/ios/iosrunner.cpp | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 1b036441ce8..a461b6edff1 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/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 { diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 604399143a9..67f60aa35e6 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/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; diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h index 35dfde07163..efc12a6c023 100644 --- a/src/plugins/debugger/debuggerruncontrol.h +++ b/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); diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index b89d89ce204..1d06ffc1fc2 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/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() - : rp.deviceSymbolsRoot); + cmd2.arg("sysroot", rp.deviceSymbolsRoot().isEmpty() ? rp.sysRoot.toUrlishString() + : rp.deviceSymbolsRoot()); cmd2.arg("remotechannel", ((rp.startMode() == AttachToRemoteProcess || rp.startMode() == AttachToRemoteServer) ? rp.remoteChannel() : QString())); diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index 6c574ed7369..3ad904bf11d 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/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");