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

Debugger: Move params modifications into fixupParamsRecipe()

Browse Source 
Change-Id: I1b08205f67913b849e078446a168ab6c9000b4d6
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-03-11 14:01:00 +01:00
parent 61dd3f520e
commit 341be4e82a
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -303,6 +303,23 @@ ExecutableItem DebuggerRunToolPrivate::fixupParamsRecipe()
return false; return false;
} }
Utils::globalMacroExpander()->registerFileVariables(
"DebuggedExecutable", Tr::tr("Debugged executable"),
[this] { return m_runParameters.inferior().command.executable(); });
q->runControl()->setDisplayName(m_runParameters.displayName());
if (auto interpreterAspect = q->runControl()->aspectData<FilePathAspect>()) {
if (auto mainScriptAspect = q->runControl()->aspectData<MainScriptAspect>()) {
const FilePath mainScript = mainScriptAspect->filePath;
const FilePath interpreter = interpreterAspect->filePath;
if (!interpreter.isEmpty() && mainScript.endsWith(".py")) {
m_runParameters.setMainScript(mainScript);
m_runParameters.setInterpreter(interpreter);
}
}
}
return true; return true;
}); });
} }
@@ -506,24 +523,6 @@ static int newRunId()
void DebuggerRunTool::continueAfterDebugServerStart() void DebuggerRunTool::continueAfterDebugServerStart()
{ {
Utils::globalMacroExpander()->registerFileVariables(
"DebuggedExecutable", Tr::tr("Debugged executable"),
[this] { return d->m_runParameters.inferior().command.executable(); }
);
runControl()->setDisplayName(d->m_runParameters.displayName());
if (auto interpreterAspect = runControl()->aspectData<FilePathAspect>()) {
if (auto mainScriptAspect = runControl()->aspectData<MainScriptAspect>()) {
const FilePath mainScript = mainScriptAspect->filePath;
const FilePath interpreter = interpreterAspect->filePath;
if (!interpreter.isEmpty() && mainScript.endsWith(".py")) {
d->m_runParameters.setMainScript(mainScript);
d->m_runParameters.setInterpreter(interpreter);
}
}
}
const auto engines = createEngines(runControl(), runParameters()); const auto engines = createEngines(runControl(), runParameters());
if (!engines) { if (!engines) {
reportFailure(engines.error()); reportFailure(engines.error());