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

Debugger: Use kit macro expander instead of global one where possible

Browse Source 
This is low hanging fruit enabling a lot more customization.

Change-Id: I1a90fa731ea512852c12a55fad75551efb44e875
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2016-03-22 10:47:03 +01:00
parent 3c2f0096ea
commit d27d51050c
6 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -4186,7 +4186,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});
}
@@ -4258,7 +4258,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())
@@ -4300,7 +4300,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});
}