diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index cefeabda9ea..28090e3ee66 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -223,7 +223,7 @@ QString ApplicationLauncher::errorString() const return d->m_consoleProcess.errorString(); } -QProcess::ProcessError ApplicationLauncher::error() const +QProcess::ProcessError ApplicationLauncher::processError() const { if (d->m_currentMode == Gui) return d->m_guiProcess.error(); diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h index a4c59d05dd4..598a71e0d8d 100644 --- a/src/plugins/projectexplorer/applicationlauncher.h +++ b/src/plugins/projectexplorer/applicationlauncher.h @@ -69,7 +69,7 @@ public: qint64 applicationPID() const; QString errorString() const; - QProcess::ProcessError error() const; + QProcess::ProcessError processError() const; static QString msgWinCannotRetrieveDebuggingOutput(); diff --git a/src/plugins/valgrind/valgrindprocess.cpp b/src/plugins/valgrind/valgrindprocess.cpp index 0656d189abe..e246ffdd59c 100644 --- a/src/plugins/valgrind/valgrindprocess.cpp +++ b/src/plugins/valgrind/valgrindprocess.cpp @@ -180,10 +180,10 @@ QString ValgrindProcess::errorString() const return m_remote.m_errorString; } -QProcess::ProcessError ValgrindProcess::error() const +QProcess::ProcessError ValgrindProcess::processError() const { if (isLocal()) - return m_localProcess.error(); + return m_localProcess.processError(); else return m_remote.m_error; } diff --git a/src/plugins/valgrind/valgrindprocess.h b/src/plugins/valgrind/valgrindprocess.h index 8ebb72e3fe3..fac6ef4b984 100644 --- a/src/plugins/valgrind/valgrindprocess.h +++ b/src/plugins/valgrind/valgrindprocess.h @@ -75,7 +75,7 @@ public: void close(); QString errorString() const; - QProcess::ProcessError error() const; + QProcess::ProcessError processError() const; void setProcessChannelMode(QProcess::ProcessChannelMode mode); void setWorkingDirectory(const QString &path); diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp index cddbf47c5c3..55709768fdc 100644 --- a/src/plugins/valgrind/valgrindrunner.cpp +++ b/src/plugins/valgrind/valgrindrunner.cpp @@ -267,7 +267,7 @@ void ValgrindRunner::processFinished(int ret, QProcess::ExitStatus status) emit finished(); if (ret != 0 || status == QProcess::CrashExit) - emit processErrorReceived(errorString(), d->process->error()); + emit processErrorReceived(errorString(), d->process->processError()); } void ValgrindRunner::localHostAddressRetrieved(const QHostAddress &localHostAddress)