diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-09-11 15:52:53 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-09-14 10:00:03 +0000 |
| commit | 226982b7b026fea5f8e8cf36da2e544de882b6e2 (patch) | |
| tree | 3e1ed074a1c7abe020eca7793816c953347f6522 /src/libs/utils/outputformatter.cpp | |
| parent | 6ab70135797ce4354502cf1444a22c9c95787a6f (diff) | |
OutputFormatter: Fix flushing a pending line feed
... for the edge case of a lone carriage return occurring in the output.
Amends b0cad9e9c7.
Also adds missing adaptations to the unit test.
Change-Id: I219b24b8fb41bb0fcea9f677cd79286d03b130c2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/libs/utils/outputformatter.cpp')
| -rw-r--r-- | src/libs/utils/outputformatter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index 49cb31d3e5..eb6e974dff 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -429,6 +429,7 @@ void OutputFormatter::append(const QString &text, const QTextCharFormat &format) { if (!plainTextEdit()) return; + flushTrailingNewline(); int startPos = 0; int crPos = -1; while ((crPos = text.indexOf('\r', startPos)) >= 0) { @@ -437,7 +438,6 @@ void OutputFormatter::append(const QString &text, const QTextCharFormat &format) d->cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor); startPos = crPos + 1; } - flushTrailingNewline(); if (startPos < text.count()) d->cursor.insertText(text.mid(startPos), format); } |