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

Debugger: Transform DebuggerRunParameters::deviceUuid

Browse Source 
Task-number: QTCREATORBUG-29168
Change-Id: I9beb1330ed1f2cffa739ca254dd3236a3bd348c1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-13 09:54:26 +01:00
parent 2b8bd19477
commit 88b342e9bd
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,8 +167,8 @@ public:
void setSysRoot(const Utils::FilePath &sysRoot) { m_sysRoot = sysRoot; } void setSysRoot(const Utils::FilePath &sysRoot) { m_sysRoot = sysRoot; }
Utils::FilePath sysRoot() const { return m_sysRoot; } Utils::FilePath sysRoot() const { return m_sysRoot; }
// iOS 17+ void setDeviceUuid(const QString &uuid) { m_deviceUuid = uuid; }
QString deviceUuid; QString deviceUuid() const { return m_deviceUuid; }
// Used by general core file debugging. Public access requested in QTCREATORBUG-17158. // Used by general core file debugging. Public access requested in QTCREATORBUG-17158.
Utils::FilePath coreFile; Utils::FilePath coreFile;
@@ -271,6 +271,8 @@ private:
QString m_deviceSymbolsRoot; QString m_deviceSymbolsRoot;
bool m_continueAfterAttach = false; bool m_continueAfterAttach = false;
Utils::FilePath m_sysRoot; Utils::FilePath m_sysRoot;
QString m_deviceUuid; // iOS 17+
}; };
namespace Internal { namespace Internal {

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

@@ -118,11 +118,6 @@ void DebuggerRunTool::setDebugInfoLocation(const FilePath &debugInfoLocation)
m_runParameters.debugInfoLocation = debugInfoLocation; m_runParameters.debugInfoLocation = debugInfoLocation;
} }
void DebuggerRunTool::setDeviceUuid(const QString &uuid)
{
m_runParameters.deviceUuid = uuid;
}
void DebuggerRunTool::setTestCase(int testCase) void DebuggerRunTool::setTestCase(int testCase)
{ {
m_runParameters.testCase = testCase; m_runParameters.testCase = testCase;

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

@@ -52,8 +52,6 @@ public:
void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item); void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item);
void setDeviceUuid(const QString &uuid);
void setAbi(const ProjectExplorer::Abi &abi); void setAbi(const ProjectExplorer::Abi &abi);
DebuggerEngineType cppEngineType() const; DebuggerEngineType cppEngineType() const;

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

@@ -269,7 +269,7 @@ void LldbEngine::handleLldbStarted()
cmd2.arg("startmode", rp.startMode()); cmd2.arg("startmode", rp.startMode());
cmd2.arg("nativemixed", isNativeMixedActive()); cmd2.arg("nativemixed", isNativeMixedActive());
cmd2.arg("workingdirectory", rp.inferior().workingDirectory.path()); cmd2.arg("workingdirectory", rp.inferior().workingDirectory.path());
cmd2.arg("deviceUuid", rp.deviceUuid); cmd2.arg("deviceUuid", rp.deviceUuid());
Environment environment = rp.inferior().environment; Environment environment = rp.inferior().environment;
// Prevent lldb from automatically setting OS_ACTIVITY_DT_MODE to mirror // Prevent lldb from automatically setting OS_ACTIVITY_DT_MODE to mirror
// NSLog to stderr, as that will also mirror os_log, which we pick up in // NSLog to stderr, as that will also mirror os_log, which we pick up in

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

@@ -926,7 +926,7 @@ IosDebugSupport::IosDebugSupport(RunControl *runControl)
if (dev->handler() == IosDevice::Handler::DeviceCtl) { if (dev->handler() == IosDevice::Handler::DeviceCtl) {
QTC_CHECK(IosDeviceManager::isDeviceCtlDebugSupported()); QTC_CHECK(IosDeviceManager::isDeviceCtlDebugSupported());
rp.setStartMode(AttachToIosDevice); rp.setStartMode(AttachToIosDevice);
setDeviceUuid(dev->uniqueInternalDeviceId()); rp.setDeviceUuid(dev->uniqueInternalDeviceId());
} else { } else {
rp.setStartMode(AttachToRemoteProcess); rp.setStartMode(AttachToRemoteProcess);
} }