forked from qt-creator/qt-creator
Fixed compilation on windows.
Reviewed-by: Erik Verbruggen
This commit is contained in:
@@ -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())), processMessage);
|
||||
emit processMessage(msgCannotExecute(m_executable, winErrorMessage(out.mid(9).toInt())), true);
|
||||
} else if (out.startsWith("pid ")) {
|
||||
// Wil not need it any more
|
||||
delete m_tempFile;
|
||||
|
@@ -141,9 +141,9 @@ void LocalApplicationRunControl::slotAppendMessage(const QString &err,
|
||||
}
|
||||
|
||||
void LocalApplicationRunControl::slotAddToOutputWindow(const QString &line,
|
||||
bool stderr)
|
||||
bool isError)
|
||||
{
|
||||
emit addToOutputWindowInline(this, line, stderr);
|
||||
emit addToOutputWindowInline(this, line, isError);
|
||||
}
|
||||
|
||||
void LocalApplicationRunControl::processExited(int exitCode)
|
||||
|
@@ -88,7 +88,7 @@ public:
|
||||
virtual bool isRunning() const;
|
||||
private slots:
|
||||
void processExited(int exitCode);
|
||||
void slotAddToOutputWindow(const QString &line, bool stderr);
|
||||
void slotAddToOutputWindow(const QString &line, bool isError);
|
||||
void slotAppendMessage(const QString &err, bool isError);
|
||||
private:
|
||||
ProjectExplorer::ApplicationLauncher m_applicationLauncher;
|
||||
|
@@ -62,7 +62,7 @@ public:
|
||||
|
||||
signals:
|
||||
void processMessage(const QString &error, bool isError);
|
||||
void receivedDebugOutput(const QString &output, bool stderr);
|
||||
void receivedDebugOutput(const QString &output, bool isError);
|
||||
void processFinished(int exitCode);
|
||||
|
||||
private:
|
||||
|
Reference in New Issue
Block a user