diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
| commit | b5e75222373db078591f1e55642a771139fb4e4f (patch) | |
| tree | 077fdd13d6dcd57dd2cbe05c318b7bbb9f0a7b69 /src/libs/utils/outputformatter.cpp | |
| parent | 841bbfa7bf2575769d7dfec2d1f238cd65aacf5d (diff) | |
| parent | 3726218b5e1311f67f41e56d1355bd35b86d9676 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/pythoneditor/pythoneditorplugin.cpp
Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
Diffstat (limited to 'src/libs/utils/outputformatter.cpp')
| -rw-r--r-- | src/libs/utils/outputformatter.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index 328c0f405c..7926422da6 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -41,7 +41,6 @@ public: QTextCharFormat formats[NumberOfFormats]; QTextCursor cursor; AnsiEscapeCodeHandler escapeCodeHandler; - OutputFormat lastFormat = NumberOfFormats; bool boldFontEnabled = true; }; @@ -72,9 +71,8 @@ void OutputFormatter::setPlainTextEdit(QPlainTextEdit *plainText) void OutputFormatter::appendMessage(const QString &text, OutputFormat format) { - if (!d->cursor.atEnd() && format != d->lastFormat) + if (!d->cursor.atEnd() && text.startsWith('\n')) d->cursor.movePosition(QTextCursor::End); - d->lastFormat = format; appendMessage(text, d->formats[format]); } |