From 274ec5657d4bf1d7a2be604ce9fa9ee4498e80f3 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Mon, 19 Apr 2010 14:55:22 +0200
Subject: [PATCH] Fixed compilation on windows.
Reviewed-by: Erik Verbruggen
---
src/libs/utils/consoleprocess_win.cpp | 2 +-
src/plugins/projectexplorer/applicationrunconfiguration.cpp | 4 ++--
src/plugins/projectexplorer/applicationrunconfiguration.h | 2 +-
src/plugins/projectexplorer/winguiprocess.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/libs/utils/consoleprocess_win.cpp b/src/libs/utils/consoleprocess_win.cpp
index 88748be1b41..a54a9e964ab 100644
--- a/src/libs/utils/consoleprocess_win.cpp
+++ b/src/libs/utils/consoleprocess_win.cpp
@@ -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;
diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.cpp b/src/plugins/projectexplorer/applicationrunconfiguration.cpp
index b7a750a4180..aab7a569444 100644
--- a/src/plugins/projectexplorer/applicationrunconfiguration.cpp
+++ b/src/plugins/projectexplorer/applicationrunconfiguration.cpp
@@ -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)
diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.h b/src/plugins/projectexplorer/applicationrunconfiguration.h
index f0060eb4297..415126078b0 100644
--- a/src/plugins/projectexplorer/applicationrunconfiguration.h
+++ b/src/plugins/projectexplorer/applicationrunconfiguration.h
@@ -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;
diff --git a/src/plugins/projectexplorer/winguiprocess.h b/src/plugins/projectexplorer/winguiprocess.h
index 34c0c3320ec..1136997df0a 100644
--- a/src/plugins/projectexplorer/winguiprocess.h
+++ b/src/plugins/projectexplorer/winguiprocess.h
@@ -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:
--
GitLab