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

BareMetal: Use runnable() to get executable and arguments

Browse Source 
... rather than accessing the aspects directly.

Task-number: QTCREATORBUG-30925
Change-Id: Id39b6226f6bbee75b93905747373513294deb29e
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2024-06-05 13:23:50 +02:00
parent 345ae8e4d4
commit 5221d53a6d
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
View File

@@ -138,11 +138,8 @@ bool GdbServerProvider::isValid() const
bool GdbServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMessage) const bool GdbServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMessage) const
{ {
QTC_ASSERT(runTool, return false); QTC_ASSERT(runTool, return false);
const RunControl *runControl = runTool->runControl(); const ProcessRunData runnable = runTool->runControl()->runnable();
const auto exeAspect = runControl->aspectData<ExecutableAspect>(); const FilePath bin = FilePath::fromString(runnable.command.executable().path());
QTC_ASSERT(exeAspect, return false);
const FilePath bin = FilePath::fromString(exeAspect->executable.path());
if (bin.isEmpty()) { if (bin.isEmpty()) {
errorMessage = Tr::tr("Cannot debug: Local executable is not set."); errorMessage = Tr::tr("Cannot debug: Local executable is not set.");
return false; return false;
@@ -155,8 +152,7 @@ bool GdbServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMessa
ProcessRunData inferior; ProcessRunData inferior;
inferior.command.setExecutable(bin); inferior.command.setExecutable(bin);
if (const auto argAspect = runControl->aspectData<ArgumentsAspect>()) inferior.command.setArguments(runnable.command.arguments());
inferior.command.setArguments(argAspect->arguments);
runTool->setInferior(inferior); runTool->setInferior(inferior);
runTool->setSymbolFile(bin); runTool->setSymbolFile(bin);
runTool->setStartMode(AttachToRemoteServer); runTool->setStartMode(AttachToRemoteServer);

6
src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
View File

@@ -168,11 +168,7 @@ QString UvscServerProvider::channelString() const
bool UvscServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMessage) const bool UvscServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMessage) const
{ {
QTC_ASSERT(runTool, return false); QTC_ASSERT(runTool, return false);
const RunControl *runControl = runTool->runControl(); const FilePath bin = runTool->runControl()->runnable().command.executable();
const auto exeAspect = runControl->aspectData<ExecutableAspect>();
QTC_ASSERT(exeAspect, return false);
const FilePath bin = exeAspect->executable;
if (bin.isEmpty()) { if (bin.isEmpty()) {
errorMessage = Tr::tr("Cannot debug: Local executable is not set."); errorMessage = Tr::tr("Cannot debug: Local executable is not set.");
return false; return false;