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
85596e7b
Commit
85596e7b
authored
Aug 04, 2009
by
con
Browse files
Debug output from TRK might have windows style line endings
parent
d680a7dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
85596e7b
...
...
@@ -591,7 +591,7 @@ void S60DeviceRunControl::signsisProcessFinished()
m_adapter
->
setCopyFileName
(
copySrc
,
copyDst
);
m_adapter
->
setInstallFileName
(
copyDst
);
m_adapter
->
setFileName
(
runFileName
);
emit
addToOutputWindow
(
this
,
tr
(
"
Start
ing application o
n
%1..."
).
arg
(
m_serialPortFriendlyName
));
emit
addToOutputWindow
(
this
,
tr
(
"
Deploy
ing application
t
o %1..."
).
arg
(
m_serialPortFriendlyName
));
if
(
!
m_adapter
->
startServer
())
{
delete
m_adapter
;
m_adapter
=
0
;
...
...
@@ -613,7 +613,7 @@ void S60DeviceRunControl::printInstallingNotice()
void
S60DeviceRunControl
::
printStartingNotice
()
{
emit
addToOutputWindow
(
this
,
tr
(
"
Runn
ing application..."
));
emit
addToOutputWindow
(
this
,
tr
(
"
Start
ing application..."
));
}
void
S60DeviceRunControl
::
printRunNotice
(
uint
pid
)
...
...
tests/manual/trk/trkutils.cpp
View file @
85596e7b
...
...
@@ -106,6 +106,7 @@ TrkResult extractResult(QByteArray *buffer)
if
(
buffer
->
at
(
4
)
!=
0x7e
)
{
result
.
isDebugOutput
=
true
;
result
.
data
=
buffer
->
mid
(
4
,
len
);
result
.
data
.
replace
(
"
\r\n
"
,
"
\n
"
);
*
buffer
=
buffer
->
mid
(
4
+
len
);
return
result
;
}
...
...
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