feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmake: Improve parser

Browse Source 
Improve qmake parser to handle yet another way it marks up warnings.

Add unit test for this case.
This commit is contained in:
Tobias Hunger
2010-11-25 11:13:17 +01:00
parent b9b8594773
commit 7af0ea38ce
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qt4projectmanager/qmakeparser.cpp
View File

@@ -69,9 +69,17 @@ void QMakeParser::stdError(const QString &line)
return; return;
} }
if (m_error.indexIn(lne) > -1) { if (m_error.indexIn(lne) > -1) {
emit addTask(Task(Task::Error, QString fileName = QDir::fromNativeSeparators(m_error.cap(1));
Task::TaskType type = Task::Error;
if (fileName.startsWith("WARNING: ")) {
type = Task::Warning;
fileName = fileName.mid(9);
} else if (fileName.startsWith("ERROR: ")) {
fileName = fileName.mid(7);
}
emit addTask(Task(type,
m_error.cap(3) /* description */, m_error.cap(3) /* description */,
QDir::fromNativeSeparators(m_error.cap(1)) /* file */, fileName,
m_error.cap(2).toInt() /* line */, m_error.cap(2).toInt() /* line */,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
return; return;
@@ -146,6 +154,17 @@ void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
QString(), -1, QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)) ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))
<< QString(); << QString();
QTest::newRow("qMake warning with location")
<< QString::fromLatin1("WARNING: e:\\NokiaQtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl:1: Unescaped backslashes are deprecated.")
<< OutputParserTester::STDERR
<< QString() << QString()
<< (QList<ProjectExplorer::Task>()
<< Task(Task::Warning,
QLatin1String("Unescaped backslashes are deprecated."),
QLatin1String("e:/NokiaQtSDK/Simulator/Qt/msvc2008/lib/qtmaind.prl"), 1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))
<< QString();
} }
void Qt4ProjectManagerPlugin::testQmakeOutputParsers() void Qt4ProjectManagerPlugin::testQmakeOutputParsers()