diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2012-10-12 15:26:32 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2012-10-12 16:28:35 +0200 |
| commit | 7ee4968b26ce5976372c3403f2fb82914746c921 (patch) | |
| tree | c75cda2ccc3d418ed465814d508f1742e13dcecd | |
| parent | 6a58e1b9fbfc6d28f9a8ba62e207a068a9c16f7a (diff) | |
| download | qt-creator-7ee4968b26ce5976372c3403f2fb82914746c921.tar.gz | |
Fix additional output omited warning
Task-number: QTCREATORBUG-8004
Change-Id: Ic45d62fe3bf36187bb88a84a019fc00dc01976fc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| -rw-r--r-- | src/plugins/coreplugin/outputwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp index fd20f00d2f..69b0467076 100644 --- a/src/plugins/coreplugin/outputwindow.cpp +++ b/src/plugins/coreplugin/outputwindow.cpp @@ -257,7 +257,7 @@ void OutputWindow::appendText(const QString &textIn, const QTextCharFormat &form { QString text = textIn; text.remove(QLatin1Char('\r')); - if (m_maxLineCount > 0 && document()->blockCount() > m_maxLineCount) + if (m_maxLineCount > 0 && document()->blockCount() >= m_maxLineCount) return; const bool atBottom = isScrollbarAtBottom(); QTextCursor cursor = QTextCursor(document()); @@ -265,10 +265,10 @@ void OutputWindow::appendText(const QString &textIn, const QTextCharFormat &form cursor.beginEditBlock(); cursor.insertText(doNewlineEnfocement(text), format); - if (m_maxLineCount > 0 && document()->blockCount() > m_maxLineCount) { + if (m_maxLineCount > 0 && document()->blockCount() >= m_maxLineCount) { QTextCharFormat tmp; tmp.setFontWeight(QFont::Bold); - cursor.insertText(tr("Additional output omitted\n"), tmp); + cursor.insertText(doNewlineEnfocement(tr("Additional output omitted\n")), tmp); } cursor.endEditBlock(); |