summaryrefslogtreecommitdiff
path: root/src/plugins/qtsupport
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@theqtcompany.com>2016-02-16 16:30:33 +0100
committerAlessandro Portale <alessandro.portale@theqtcompany.com>2016-02-16 19:01:54 +0000
commitb01906b799df5dd83302e254afe5266a56aab2cb (patch)
treee204dfb8f1e8a19550a3db88f12ea21ac384c5c2 /src/plugins/qtsupport
parentb11c14808d4c2b1b6a24d0dadcd017a790b9d135 (diff)
downloadqt-creator-b01906b799df5dd83302e254afe5266a56aab2cb.tar.gz
QtSupport: Compile fix for msvc
parameter cannot be called stderr, if it is not that stderr. Change-Id: Ifdfbbd650ec7fe6aa9ce560ace96fbe65961c0b5 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'src/plugins/qtsupport')
-rw-r--r--src/plugins/qtsupport/qscxmlcgenerator.cpp4
-rw-r--r--src/plugins/qtsupport/qscxmlcgenerator.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp
index 69bc88957f..1597721002 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.cpp
+++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp
@@ -48,10 +48,10 @@ QScxmlcGenerator::QScxmlcGenerator(const ProjectExplorer::Project *project,
this, &QScxmlcGenerator::finishProcess);
}
-void QScxmlcGenerator::parseIssues(const QByteArray &stderr)
+void QScxmlcGenerator::parseIssues(const QByteArray &processStderr)
{
QList<ProjectExplorer::Task> issues;
- foreach (const QByteArray &line, stderr.split('\n')) {
+ foreach (const QByteArray &line, processStderr.split('\n')) {
QByteArrayList tokens = line.split(':');
if (tokens.length() > 4) {
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.h b/src/plugins/qtsupport/qscxmlcgenerator.h
index f5a4c92277..9a305996e7 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.h
+++ b/src/plugins/qtsupport/qscxmlcgenerator.h
@@ -46,7 +46,7 @@ private:
QProcess m_process;
QTemporaryDir m_tmpdir;
- void parseIssues(const QByteArray &stderr);
+ void parseIssues(const QByteArray &processStderr);
};
class QScxmlcGeneratorFactory : public ProjectExplorer::ExtraCompilerFactory