Merge remote-tracking branch 'origin/13.0'

Change-Id: If752e3383b35873b696e8beca27d8838a4096c8a

1 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 3d9777f51e1..7a428c6a857 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -2096,9 +2096,11 @@ void CdbEngine::handleExtensionMessage(char t, int token, const QString &what, c
     }
 
     if (what == "debuggee_output") {
-        const QByteArray decoded = QByteArray::fromHex(message.toUtf8());
-        showMessage(QString::fromUtf16(reinterpret_cast<const char16_t *>(decoded.data()), decoded.size() / 2),
-                    AppOutput);
+        const QByteArray encoded = QByteArray::fromHex(message.toUtf8());
+        const QString message = QString::fromUtf16(reinterpret_cast<const char16_t *>(
+                                                       encoded.data()),
+                                                   encoded.size() / 2);
+        showMessage(message.endsWith('\n') ? message : message + '\n', AppOutput);
         return;
     }