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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
This commit is contained in:
Eike Ziller
2012-10-16 17:42:10 +02:00
parent 07565f155f 1982a3b5a5
commit 70b5e1f64d
79 changed files with 9036 additions and 1899 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;
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();