feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Transform DebuggerRunParameters::deviceSymbolsRoot

Browse Source 
Task-number: QTCREATORBUG-29168
Change-Id: Iad164b9c37cdced6b823da976be8bc87aa97dcb1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-10 14:14:45 +01:00
parent 6dda3d36a2
commit 6d5d413bde
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/debuggerengine.h
View File

@@ -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 {

5
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -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;

1
src/plugins/debugger/debuggerruncontrol.h
View File

@@ -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);

4
src/plugins/debugger/lldb/lldbengine.cpp
View File

@@ -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()));

2
src/plugins/ios/iosrunner.cpp
View File

@@ -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");