summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/gdb/gdbengine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/debugger/gdb/gdbengine.cpp')
-rw-r--r--src/plugins/debugger/gdb/gdbengine.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 2251a0d3ab..5b99bcd2c8 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4193,7 +4193,7 @@ void GdbEngine::loadInitScript()
).arg(script));
}
} else {
- const QString commands = stringSetting(GdbStartupCommands);
+ const QString commands = expand(stringSetting(GdbStartupCommands));
if (!commands.isEmpty())
runCommand({commands.toLocal8Bit(), NoFlags});
}
@@ -4265,7 +4265,7 @@ void GdbEngine::abortDebugger()
void GdbEngine::resetInferior()
{
if (!runParameters().commandsForReset.isEmpty()) {
- QByteArray commands = globalMacroExpander()->expand(runParameters().commandsForReset);
+ const QByteArray commands = expand(runParameters().commandsForReset);
foreach (QByteArray command, commands.split('\n')) {
command = command.trimmed();
if (!command.isEmpty())
@@ -4307,7 +4307,7 @@ void GdbEngine::handleInferiorPrepared()
CHECK_STATE(InferiorSetupRequested);
if (!rp.commandsAfterConnect.isEmpty()) {
- QByteArray commands = globalMacroExpander()->expand(rp.commandsAfterConnect);
+ const QByteArray commands = expand(rp.commandsAfterConnect);
foreach (QByteArray command, commands.split('\n'))
runCommand({command, NoFlags});
}