forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -37,15 +37,26 @@ 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;
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -46,6 +46,8 @@ public:
|
||||
void setProjectFileList(const QStringList &fileList);
|
||||
|
||||
private:
|
||||
void parse(const QString &line);
|
||||
|
||||
QRegExp m_javaRegExp;
|
||||
QStringList m_fileList;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user