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
eefb35a8
Commit
eefb35a8
authored
Dec 03, 2008
by
Oswald Buddenhagen
Browse files
html-escape text appended to the log windows.
parent
e9f5b6ab
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggerrunner.cpp
View file @
eefb35a8
...
...
@@ -44,6 +44,7 @@
#include
<QtCore/QDebug>
#include
<QtCore/QDir>
#include
<QtCore/QFileInfo>
#include
<QtGui/QTextDocument>
using
namespace
Debugger
::
Internal
;
...
...
@@ -140,8 +141,8 @@ void DebuggerRunControl::slotAddToOutputWindow(const QString &prefix, const QStr
{
Q_UNUSED
(
prefix
);
foreach
(
const
QString
&
l
,
line
.
split
(
'\n'
))
emit
addToOutputWindow
(
this
,
prefix
+
l
);
//emit addToOutputWindow(this, prefix + line);
emit
addToOutputWindow
(
this
,
prefix
+
Qt
::
escape
(
l
)
);
//emit addToOutputWindow(this, prefix +
Qt::escape(
line)
)
;
}
void
DebuggerRunControl
::
stop
()
...
...
src/plugins/projectexplorer/abstractprocessstep.cpp
View file @
eefb35a8
...
...
@@ -39,6 +39,7 @@
#include
<QtCore/QEventLoop>
#include
<QtCore/QDebug>
#include
<QtCore/QTimer>
#include
<QtGui/QTextDocument>
using
namespace
ProjectExplorer
;
...
...
@@ -165,7 +166,7 @@ void AbstractProcessStep::run(QFutureInterface<bool> & fi)
void
AbstractProcessStep
::
processStarted
()
{
emit
addToOutputWindow
(
tr
(
"<font color=
\"
#0000ff
\"
>Starting: %1 %2</font>
\n
"
).
arg
(
m_command
,
m_arguments
.
join
(
" "
)));
emit
addToOutputWindow
(
tr
(
"<font color=
\"
#0000ff
\"
>Starting: %1 %2</font>
\n
"
).
arg
(
m_command
,
Qt
::
escape
(
m_arguments
.
join
(
" "
)))
)
;
}
bool
AbstractProcessStep
::
processFinished
(
int
exitCode
,
QProcess
::
ExitStatus
status
)
...
...
@@ -196,7 +197,7 @@ void AbstractProcessStep::processReadyReadStdOutput()
void
AbstractProcessStep
::
stdOut
(
const
QString
&
line
)
{
emit
addToOutputWindow
(
line
);
emit
addToOutputWindow
(
Qt
::
escape
(
line
)
)
;
}
void
AbstractProcessStep
::
processReadyReadStdError
()
...
...
@@ -211,7 +212,7 @@ void AbstractProcessStep::processReadyReadStdError()
void
AbstractProcessStep
::
stdError
(
const
QString
&
line
)
{
emit
addToOutputWindow
(
QLatin1String
(
"<font color=
\"
#ff0000
\"
>"
)
+
line
+
QLatin1String
(
"</font>"
));
emit
addToOutputWindow
(
QLatin1String
(
"<font color=
\"
#ff0000
\"
>"
)
+
Qt
::
escape
(
line
)
+
QLatin1String
(
"</font>"
));
}
void
AbstractProcessStep
::
checkForCancel
()
...
...
src/plugins/projectexplorer/applicationrunconfiguration.cpp
View file @
eefb35a8
...
...
@@ -38,6 +38,7 @@
#include
<projectexplorer/projectexplorerconstants.h>
#include
<QtGui/QLabel>
#include
<QtGui/QTextDocument>
#include
<QDebug>
using
namespace
ProjectExplorer
;
...
...
@@ -160,7 +161,7 @@ void ApplicationRunControl::slotError(const QString & err)
void
ApplicationRunControl
::
slotAddToOutputWindow
(
const
QString
&
line
)
{
emit
addToOutputWindow
(
this
,
line
);
emit
addToOutputWindow
(
this
,
Qt
::
escape
(
line
)
)
;
}
void
ApplicationRunControl
::
processExited
(
int
exitCode
)
...
...
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