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
Tobias Hunger
qt-creator
Commits
57524485
Commit
57524485
authored
Feb 19, 2009
by
hjk
Browse files
Fixes: work on QT_NO_CAST_FROM_BYTEARRAY
parent
9c80a469
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/libs/utils/synchronousprocess.cpp
View file @
57524485
...
...
@@ -309,12 +309,12 @@ void SynchronousProcess::stdErrReady()
QString
SynchronousProcess
::
convertStdErr
(
const
QByteArray
&
ba
)
{
return
QString
::
fromLocal8Bit
(
ba
).
remove
(
QLatin1Char
(
'\r'
));
return
QString
::
fromLocal8Bit
(
ba
.
constData
(),
ba
.
size
()
).
remove
(
QLatin1Char
(
'\r'
));
}
QString
SynchronousProcess
::
convertStdOut
(
const
QByteArray
&
ba
)
const
{
QString
stdOut
=
m_d
->
m_stdOutCodec
?
m_d
->
m_stdOutCodec
->
toUnicode
(
ba
)
:
QString
::
fromLocal8Bit
(
ba
);
QString
stdOut
=
m_d
->
m_stdOutCodec
?
m_d
->
m_stdOutCodec
->
toUnicode
(
ba
)
:
QString
::
fromLocal8Bit
(
ba
.
constData
(),
ba
.
size
()
);
return
stdOut
.
remove
(
QLatin1Char
(
'\r'
));
}
...
...
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