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

Fix additional output omited warning

Browse Source 
Task-number: QTCREATORBUG-8004
Change-Id: Ic45d62fe3bf36187bb88a84a019fc00dc01976fc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-10-12 15:26:32 +02:00
parent 6a58e1b9fb
commit 7ee4968b26
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/outputwindow.cpp
View File

@@ -257,7 +257,7 @@ void OutputWindow::appendText(const QString &textIn, const QTextCharFormat &form
{ {
QString text = textIn; QString text = textIn;
text.remove(QLatin1Char('\r')); text.remove(QLatin1Char('\r'));
if (m_maxLineCount > 0 && document()->blockCount() > m_maxLineCount) if (m_maxLineCount > 0 && document()->blockCount() >= m_maxLineCount)
return; return;
const bool atBottom = isScrollbarAtBottom(); const bool atBottom = isScrollbarAtBottom();
QTextCursor cursor = QTextCursor(document()); QTextCursor cursor = QTextCursor(document());
@@ -265,10 +265,10 @@ void OutputWindow::appendText(const QString &textIn, const QTextCharFormat &form
cursor.beginEditBlock(); cursor.beginEditBlock();
cursor.insertText(doNewlineEnfocement(text), format); cursor.insertText(doNewlineEnfocement(text), format);
if (m_maxLineCount > 0 && document()->blockCount() > m_maxLineCount) { if (m_maxLineCount > 0 && document()->blockCount() >= m_maxLineCount) {
QTextCharFormat tmp; QTextCharFormat tmp;
tmp.setFontWeight(QFont::Bold); tmp.setFontWeight(QFont::Bold);
cursor.insertText(tr("Additional output omitted\n"), tmp); cursor.insertText(doNewlineEnfocement(tr("Additional output omitted\n")), tmp);
} }
cursor.endEditBlock(); cursor.endEditBlock();