Merge remote-tracking branch 'origin/4.8'

Change-Id: I5b18233936e3b2cd674df92a694ba73b5a3ed752
2018-12-02 22:07:22 +02:00
parent c9a48ad5b1 f0226d9644
commit 7096649fc2
28 changed files with 242 additions and 70 deletions
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -757,6 +757,7 @@ void GdbEngine::runCommand(const DebuggerCommand &command)
        if (state() == InferiorRunOk) {
            showStatusMessage(tr("Stopping temporarily."), 1000);
            m_onStop.append(cmd, wantContinue);
+            setState(InferiorStopRequested);
            interruptInferior();
            return;
        }