diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h index 5b8d6162b18a26a33c9072f06c948607f74516c3..5113cf2608f54a19729f3e47f33990fc3fbc52df 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 489f08d7ed5d94efa5517be20be630bace95086c..fac9abba095290361260c7b3c9b19cd795e897b5 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 ed762a6be44c7c9423e4fa1bbf1e9fc768e51e51..0d83d10be9835ec4fca770b8cbdc7479f64fe6a9 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 f8f9766ef90fbfcc116eb539304d4481aa54f940..95b4c0d17def30db87c804276d8e7b24de97f1de 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: