From d491faf94aaf7f849ba1911e6b91d391528f81ea Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Fri, 9 Jun 2023 12:59:14 +0200 Subject: [PATCH] Utils: Send ack from Process stub Allow the server to listen for command results. Fixes Qt Creator hanging when stopping application being debugged. Change-Id: Ia175b1bb1836b5593bc073394fa152923e1dda28 Reviewed-by: Reviewed-by: Cristian Adam --- src/libs/utils/terminalinterface.cpp | 2 ++ src/tools/process_stub/main.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/libs/utils/terminalinterface.cpp b/src/libs/utils/terminalinterface.cpp index 7046d7855ca..9b6e6457102 100644 --- a/src/libs/utils/terminalinterface.cpp +++ b/src/libs/utils/terminalinterface.cpp @@ -183,6 +183,8 @@ void TerminalInterface::onStubReadyRead() emitFinished(out.mid(5).toInt(), QProcess::NormalExit); } else if (out.startsWith("crash ")) { emitFinished(out.mid(6).toInt(), QProcess::CrashExit); + } else if (out.startsWith("ack ")) { + qCDebug(terminalInterfaceLog) << "Received ack from stub: " << out; } else { emitError(QProcess::UnknownError, msgUnexpectedOutput(out)); break; diff --git a/src/tools/process_stub/main.cpp b/src/tools/process_stub/main.cpp index d5fdc2f4086..bfb6f6c3211 100644 --- a/src/tools/process_stub/main.cpp +++ b/src/tools/process_stub/main.cpp @@ -542,6 +542,8 @@ void onControlSocketReadyRead() break; } } + + sendMsg(QString("ack %1\n").arg(ch).toUtf8()); } }