Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
3bebc091
Commit
3bebc091
authored
Jul 27, 2010
by
dt
Browse files
Fix too many newlines in compile output
Task-Nr: QTCREATORBUG-1867
parent
f3de5fb6
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/projectexplorer/msvcparser.cpp
View file @
3bebc091
...
...
@@ -63,7 +63,7 @@ void MsvcParser::stdOutput(const QString &line)
Constants
::
TASK_CATEGORY_COMPILE
));
return
;
}
IOutputParser
::
std
Error
(
line
);
IOutputParser
::
std
Output
(
line
);
}
Task
::
TaskType
MsvcParser
::
toType
(
int
number
)
...
...
src/plugins/projectexplorer/outputwindow.cpp
View file @
3bebc091
...
...
@@ -505,8 +505,10 @@ QString OutputWindow::doNewlineEnfocement(const QString &out)
return
s
;
}
void
OutputWindow
::
appendApplicationOutput
(
const
QString
&
out
,
bool
onStdErr
)
void
OutputWindow
::
appendApplicationOutput
(
const
QString
&
out
put
,
bool
onStdErr
)
{
QString
out
=
output
;
out
.
remove
(
QLatin1Char
(
'\r'
));
setMaximumBlockCount
(
MaxBlockCount
);
const
bool
atBottom
=
isScrollbarAtBottom
();
m_formatter
->
appendApplicationOutput
(
doNewlineEnfocement
(
out
),
onStdErr
);
...
...
@@ -515,8 +517,10 @@ void OutputWindow::appendApplicationOutput(const QString &out, bool onStdErr)
enableUndoRedo
();
}
void
OutputWindow
::
appendApplicationOutputInline
(
const
QString
&
out
,
bool
onStdErr
)
void
OutputWindow
::
appendApplicationOutputInline
(
const
QString
&
out
put
,
bool
onStdErr
)
{
QString
out
=
output
;
out
.
remove
(
QLatin1Char
(
'\r'
));
m_scrollToBottom
=
true
;
setMaximumBlockCount
(
MaxBlockCount
);
...
...
@@ -547,8 +551,10 @@ void OutputWindow::appendApplicationOutputInline(const QString &out, bool onStdE
enableUndoRedo
();
}
void
OutputWindow
::
appendMessage
(
const
QString
&
out
,
bool
isError
)
void
OutputWindow
::
appendMessage
(
const
QString
&
out
put
,
bool
isError
)
{
QString
out
=
output
;
out
.
remove
(
QLatin1Char
(
'\r'
));
setMaximumBlockCount
(
MaxBlockCount
);
const
bool
atBottom
=
isScrollbarAtBottom
();
m_formatter
->
appendMessage
(
doNewlineEnfocement
(
out
),
isError
);
...
...
@@ -558,8 +564,10 @@ void OutputWindow::appendMessage(const QString &out, bool isError)
}
// TODO rename
void
OutputWindow
::
appendText
(
const
QString
&
text
,
const
QTextCharFormat
&
format
,
int
maxLineCount
)
void
OutputWindow
::
appendText
(
const
QString
&
text
In
,
const
QTextCharFormat
&
format
,
int
maxLineCount
)
{
QString
text
=
textIn
;
text
.
remove
(
QLatin1Char
(
'\r'
));
if
(
document
()
->
blockCount
()
>
maxLineCount
)
return
;
const
bool
atBottom
=
isScrollbarAtBottom
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment