From 8a4a7b7118b991222b3612a09e48c7c852bda9c2 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 11 May 2011 11:29:44 +0200
Subject: [PATCH] the windows debug channel knows no stdout/stderr distinction
---
src/plugins/projectexplorer/applicationlauncher.h | 2 +-
src/plugins/projectexplorer/applicationlauncher_win.cpp | 9 ++++-----
src/plugins/projectexplorer/winguiprocess.cpp | 2 +-
src/plugins/projectexplorer/winguiprocess.h | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h
index 5b8d6162b18..5113cf2608f 100644
--- a/src/plugins/projectexplorer/applicationlauncher.h
+++ b/src/plugins/projectexplorer/applicationlauncher.h
@@ -78,7 +78,7 @@ private slots:
void processStopped();
void appendProcessMessage(const QString &output, bool onStdErr);
#ifdef Q_OS_WIN
- void readWinDebugOutput(const QString &output, bool onStdErr);
+ void readWinDebugOutput(const QString &output);
void processFinished(int exitCode);
#else
void guiProcessError();
diff --git a/src/plugins/projectexplorer/applicationlauncher_win.cpp b/src/plugins/projectexplorer/applicationlauncher_win.cpp
index 489f08d7ed5..fac9abba095 100644
--- a/src/plugins/projectexplorer/applicationlauncher_win.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher_win.cpp
@@ -58,8 +58,8 @@ ApplicationLauncher::ApplicationLauncher(QObject *parent)
connect(&d->m_winGuiProcess, SIGNAL(processMessage(QString, bool)),
this, SLOT(appendProcessMessage(QString,bool)));
- connect(&d->m_winGuiProcess, SIGNAL(receivedDebugOutput(QString, bool)),
- this, SLOT(readWinDebugOutput(QString, bool)));
+ connect(&d->m_winGuiProcess, SIGNAL(receivedDebugOutput(QString)),
+ this, SLOT(readWinDebugOutput(QString)));
connect(&d->m_winGuiProcess, SIGNAL(processFinished(int)),
this, SLOT(processFinished(int)));
}
@@ -132,10 +132,9 @@ void ApplicationLauncher::appendProcessMessage(const QString &output, bool onStd
emit appendMessage(output, onStdErr ? Utils::ErrorMessageFormat : Utils::NormalMessageFormat);
}
-void ApplicationLauncher::readWinDebugOutput(const QString &output,
- bool onStdErr)
+void ApplicationLauncher::readWinDebugOutput(const QString &output)
{
- emit appendMessage(output, onStdErr ? Utils::StdErrFormat : Utils::StdOutFormat);
+ emit appendMessage(output, Utils::StdErrFormat);
}
void ApplicationLauncher::processStopped()
diff --git a/src/plugins/projectexplorer/winguiprocess.cpp b/src/plugins/projectexplorer/winguiprocess.cpp
index ed762a6be44..0d83d10be98 100644
--- a/src/plugins/projectexplorer/winguiprocess.cpp
+++ b/src/plugins/projectexplorer/winguiprocess.cpp
@@ -151,7 +151,7 @@ void WinGuiProcess::run()
void WinGuiProcess::checkDebugOutput(qint64 pid, const QString &message)
{
if (applicationPID() == pid)
- emit receivedDebugOutput(message, false);
+ emit receivedDebugOutput(message);
}
void WinGuiProcess::done()
diff --git a/src/plugins/projectexplorer/winguiprocess.h b/src/plugins/projectexplorer/winguiprocess.h
index f8f9766ef90..95b4c0d17de 100644
--- a/src/plugins/projectexplorer/winguiprocess.h
+++ b/src/plugins/projectexplorer/winguiprocess.h
@@ -63,7 +63,7 @@ public:
signals:
void processMessage(const QString &error, bool isError);
- void receivedDebugOutput(const QString &output, bool isError);
+ void receivedDebugOutput(const QString &output);
void processFinished(int exitCode);
private slots:
--
GitLab