Commit 8a4a7b71 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

the windows debug channel knows no stdout/stderr distinction

parent 7c3a291e
......@@ -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();
......
......@@ -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()
......
......@@ -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()
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment