Skip to content
GitLab
Menu
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
274ec565
Commit
274ec565
authored
Apr 19, 2010
by
Daniel Molkentin
Browse files
Fixed compilation on windows.
Reviewed-by: Erik Verbruggen
parent
d864bfa1
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/libs/utils/consoleprocess_win.cpp
View file @
274ec565
...
...
@@ -181,7 +181,7 @@ void ConsoleProcess::readStubOutput()
if
(
out
.
startsWith
(
"err:chdir "
))
{
emit
processMessage
(
msgCannotChangeToWorkDir
(
workingDirectory
(),
winErrorMessage
(
out
.
mid
(
10
).
toInt
())),
true
);
}
else
if
(
out
.
startsWith
(
"err:exec "
))
{
emit
processMessage
(
msgCannotExecute
(
m_executable
,
winErrorMessage
(
out
.
mid
(
9
).
toInt
())),
processMessag
e
);
emit
processMessage
(
msgCannotExecute
(
m_executable
,
winErrorMessage
(
out
.
mid
(
9
).
toInt
())),
tru
e
);
}
else
if
(
out
.
startsWith
(
"pid "
))
{
// Wil not need it any more
delete
m_tempFile
;
...
...
src/plugins/projectexplorer/applicationrunconfiguration.cpp
View file @
274ec565
...
...
@@ -141,9 +141,9 @@ void LocalApplicationRunControl::slotAppendMessage(const QString &err,
}
void
LocalApplicationRunControl
::
slotAddToOutputWindow
(
const
QString
&
line
,
bool
stder
r
)
bool
isErro
r
)
{
emit
addToOutputWindowInline
(
this
,
line
,
stder
r
);
emit
addToOutputWindowInline
(
this
,
line
,
isErro
r
);
}
void
LocalApplicationRunControl
::
processExited
(
int
exitCode
)
...
...
src/plugins/projectexplorer/applicationrunconfiguration.h
View file @
274ec565
...
...
@@ -88,7 +88,7 @@ public:
virtual
bool
isRunning
()
const
;
private
slots
:
void
processExited
(
int
exitCode
);
void
slotAddToOutputWindow
(
const
QString
&
line
,
bool
stder
r
);
void
slotAddToOutputWindow
(
const
QString
&
line
,
bool
isErro
r
);
void
slotAppendMessage
(
const
QString
&
err
,
bool
isError
);
private:
ProjectExplorer
::
ApplicationLauncher
m_applicationLauncher
;
...
...
src/plugins/projectexplorer/winguiprocess.h
View file @
274ec565
...
...
@@ -62,7 +62,7 @@ public:
signals:
void
processMessage
(
const
QString
&
error
,
bool
isError
);
void
receivedDebugOutput
(
const
QString
&
output
,
bool
stder
r
);
void
receivedDebugOutput
(
const
QString
&
output
,
bool
isErro
r
);
void
processFinished
(
int
exitCode
);
private:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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