summaryrefslogtreecommitdiff
path: root/src/plugins/android/javaparser.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2013-04-02 15:17:55 +0200
committerTobias Hunger <tobias.hunger@digia.com>2013-04-02 16:02:31 +0200
commitc71d734d0897a45e82d58ef3d85902a7ac65840f (patch)
tree58b287c249cb8b6e2f6d0b2807bf31f93e19ce88 /src/plugins/android/javaparser.cpp
parentf1741032a8b9eaaf531e9208915eb98e2f2b0e9b (diff)
downloadqt-creator-c71d734d0897a45e82d58ef3d85902a7ac65840f.tar.gz
Android: Fix Javaparser
Make sure to send output down the right channel in case some parser is appended. Change-Id: Ibb6810acf7498c07d5169b6133d8d04ce21ce993 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/android/javaparser.cpp')
-rw-r--r--src/plugins/android/javaparser.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/plugins/android/javaparser.cpp b/src/plugins/android/javaparser.cpp
index 23f4c0c62f..8ef58a936c 100644
--- a/src/plugins/android/javaparser.cpp
+++ b/src/plugins/android/javaparser.cpp
@@ -37,16 +37,27 @@ using namespace ProjectExplorer;
JavaParser::JavaParser() :
m_javaRegExp(QLatin1String("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$"))
-{
-}
+{ }
void JavaParser::stdOutput(const QString &line)
{
- stdError(line);
+ parse(line);
+ IOutputParser::stdOutput(line);
}
void JavaParser::stdError(const QString &line)
{
+ parse(line);
+ IOutputParser::stdError(line);
+}
+
+void JavaParser::setProjectFileList(const QStringList &fileList)
+{
+ m_fileList = fileList;
+}
+
+void JavaParser::parse(const QString &line)
+{
if (m_javaRegExp.indexIn(line) > -1) {
bool ok;
int lineno = m_javaRegExp.cap(3).toInt(&ok);
@@ -67,10 +78,5 @@ void JavaParser::stdError(const QString &line)
emit addTask(task);
return;
}
- IOutputParser::stdError(line);
-}
-void JavaParser::setProjectFileList(const QStringList &fileList)
-{
- m_fileList = fileList;
}