feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixed compilation on windows.

Browse Source 
Reviewed-by: Erik Verbruggen
This commit is contained in:
Daniel Molkentin
2010-04-19 14:55:22 +02:00
parent d864bfa124
commit 274ec5657d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/consoleprocess_win.cpp
View File

@@ -181,7 +181,7 @@ void ConsoleProcess::readStubOutput()
if (out.startsWith("err:chdir ")) { if (out.startsWith("err:chdir ")) {
emit processMessage(msgCannotChangeToWorkDir(workingDirectory(), winErrorMessage(out.mid(10).toInt())), true); emit processMessage(msgCannotChangeToWorkDir(workingDirectory(), winErrorMessage(out.mid(10).toInt())), true);
} else if (out.startsWith("err:exec ")) { } 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 ")) { } else if (out.startsWith("pid ")) {
// Wil not need it any more // Wil not need it any more
delete m_tempFile; delete m_tempFile;

4
src/plugins/projectexplorer/applicationrunconfiguration.cpp
View File

@@ -141,9 +141,9 @@ void LocalApplicationRunControl::slotAppendMessage(const QString &err,
} }
void LocalApplicationRunControl::slotAddToOutputWindow(const QString &line, 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) void LocalApplicationRunControl::processExited(int exitCode)

2
src/plugins/projectexplorer/applicationrunconfiguration.h
View File

@@ -88,7 +88,7 @@ public:
virtual bool isRunning() const; virtual bool isRunning() const;
private slots: private slots:
void processExited(int exitCode); 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); void slotAppendMessage(const QString &err, bool isError);
private: private:
ProjectExplorer::ApplicationLauncher m_applicationLauncher; ProjectExplorer::ApplicationLauncher m_applicationLauncher;

2
src/plugins/projectexplorer/winguiprocess.h
View File

@@ -62,7 +62,7 @@ public:
signals: signals:
void processMessage(const QString &error, bool isError); 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); void processFinished(int exitCode);
private: private: