feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/pythoneditor/pythoneditorplugin.cpp

Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
This commit is contained in:
Eike Ziller
2019-04-02 12:22:48 +02:00
parent 841bbfa7bf 3726218b5e
commit b5e7522237
170 changed files with 3484 additions and 1979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/outputformatter.cpp
View File

@@ -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]);
}