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

Debugger: Allow explicitly marking of non-Python commands again

Browse Source 
This conceptually reverts part of a61b6dfc.

Task-number: QTCREATORBUG-17594
Change-Id: I9ff72a027838a20039f217ed0d669b6c45bc2acf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2017-01-20 10:05:31 +01:00
parent 4ecbebace5
commit a17919fbd0
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -939,7 +939,7 @@ void GdbEngine::runCommand(const DebuggerCommand &command)
++m_nonDiscardableCount;
bool isPythonCommand = true;
if (cmd.function.contains('-') || cmd.function.contains(' '))
if ((cmd.flags & NativeCommand) || cmd.function.contains('-') || cmd.function.contains(' '))
isPythonCommand = false;
if (isPythonCommand) {
cmd.arg("token", token);
@@ -4157,7 +4157,7 @@ void GdbEngine::resetInferior()
foreach (QString command, commands.split('\n')) {
command = command.trimmed();
if (!command.isEmpty())
runCommand({command, ConsoleCommand | NeedsTemporaryStop});
runCommand({command, ConsoleCommand | NeedsTemporaryStop | NativeCommand});
}
}
m_rerunPending = true;
@@ -4205,7 +4205,7 @@ void GdbEngine::handleInferiorPrepared()
if (!rp.commandsAfterConnect.isEmpty()) {
const QString commands = expand(rp.commandsAfterConnect);
for (const QString &command : commands.split('\n'))
runCommand({command});
runCommand({command, NativeCommand});
}
//runCommand("set follow-exec-mode new");