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

Debugger: Transform DebuggerRunParameters::platform

Browse Source 
Merge setIosPlatform() into setLldbPlatform().

Task-number: QTCREATORBUG-29168
Change-Id: Ib29e291921fd0b64076df6ddbe2aaa1ffa3adc07
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-10 14:04:52 +01:00
parent 2162e82aa1
commit 6dda3d36a2
7 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androiddebugsupport.cpp
View File

@@ -86,13 +86,13 @@ public:
explicit AndroidDebugSupport(RunControl *runControl) : Debugger::DebuggerRunTool(runControl)
{
setId("AndroidDebugger");
setLldbPlatform("remote-android");
DebuggerRunParameters &rp = runParameters();
rp.setLldbPlatform("remote-android");
m_runner = new AndroidRunner(runControl);
addStartDependency(m_runner);
Target *target = runControl->target();
Kit *kit = target->kit();
DebuggerRunParameters &rp = runParameters();
rp.setStartMode(AttachToRemoteServer);
const QString packageName = Internal::packageName(target);
rp.setDisplayName(packageName);

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

@@ -150,8 +150,9 @@ public:
void addSearchDirectory(const Utils::FilePath &dir) { m_additionalSearchDirectories.append(dir); }
Utils::FilePaths additionalSearchDirectories() const { return m_additionalSearchDirectories; }
// Used by iOS.
QString platform;
void setLldbPlatform(const QString &platform) { m_lldbPlatform = platform; }
QString lldbPlatform() const { return m_lldbPlatform; }
QString deviceSymbolsRoot;
bool continueAfterAttach = false;
Utils::FilePath sysRoot;
@@ -253,6 +254,8 @@ private:
bool m_useTargetAsync = false;
Utils::FilePaths m_additionalSearchDirectories;
QString m_lldbPlatform;
};
namespace Internal {

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

@@ -108,11 +108,6 @@ void DebuggerRunTool::setSysRoot(const Utils::FilePath &sysRoot)
m_runParameters.sysRoot = sysRoot;
}
void DebuggerRunTool::setLldbPlatform(const QString &platform)
{
m_runParameters.platform = platform;
}
void DebuggerRunTool::setContinueAfterAttach(bool on)
{
m_runParameters.continueAfterAttach = on;
@@ -133,11 +128,6 @@ void DebuggerRunTool::setDebugInfoLocation(const FilePath &debugInfoLocation)
m_runParameters.debugInfoLocation = debugInfoLocation;
}
void DebuggerRunTool::setIosPlatform(const QString &platform)
{
m_runParameters.platform = platform;
}
void DebuggerRunTool::setDeviceSymbolsRoot(const QString &deviceSymbolsRoot)
{
m_runParameters.deviceSymbolsRoot = deviceSymbolsRoot;

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

@@ -52,7 +52,6 @@ public:
DebuggerRunParameters &runParameters() { return m_runParameters; }
void setLldbPlatform(const QString &platform);
void addQmlServerInferiorCommandLineArgumentIfNeeded();
void setupPortsGatherer();
@@ -63,7 +62,6 @@ public:
void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item);
void setIosPlatform(const QString &platform);
void setDeviceSymbolsRoot(const QString &deviceSymbolsRoot);
void setDeviceUuid(const QString &uuid);

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

@@ -286,7 +286,7 @@ void LldbEngine::handleLldbStarted()
"processargs",
toHex(ProcessArgs::splitArgs(rp.inferior().command.arguments(), HostOsInfo::hostOs())
.join(QChar(0))));
cmd2.arg("platform", rp.platform);
cmd2.arg("platform", rp.lldbPlatform());
cmd2.arg("symbolfile", rp.symbolFile().path());
if (usesTerminal()) {

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

@@ -930,7 +930,7 @@ IosDebugSupport::IosDebugSupport(RunControl *runControl)
} else {
rp.setStartMode(AttachToRemoteProcess);
}
setIosPlatform("remote-ios");
rp.setLldbPlatform("remote-ios");
const expected_str<FilePath> deviceSdk = findDeviceSdk(dev);
if (!deviceSdk)
@@ -939,7 +939,7 @@ IosDebugSupport::IosDebugSupport(RunControl *runControl)
setDeviceSymbolsRoot(deviceSdk->path());
} else {
rp.setStartMode(AttachToLocalProcess);
setIosPlatform("ios-simulator");
rp.setLldbPlatform("ios-simulator");
}
}

4
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
View File

@@ -58,9 +58,9 @@ public:
rp.setUseExtendedRemote(true);
if (rc->device()->osType() == Utils::OsTypeMac)
debugger->setLldbPlatform("remote-macosx");
rp.setLldbPlatform("remote-macosx");
else
debugger->setLldbPlatform("remote-linux");
rp.setLldbPlatform("remote-linux");
return debugger;
});
addSupportedRunMode(ProjectExplorer::Constants::DEBUG_RUN_MODE);