diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2014-07-24 11:46:58 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-07-24 11:56:23 +0200 |
| commit | 5cc2bab085272f2f4f3bff44b46bb200f101a2c0 (patch) | |
| tree | 2056e30f110c4b303df0cd448ef9888a1ff879e6 /src/plugins/qtsupport/qtparser.cpp | |
| parent | 0ffe7f482daab21b119fc75b2b5a577ef64250ba (diff) | |
QtParser: Also handle notes from moc
Change-Id: I4ecbeb91be0890d8ab56ed6fe247fb8494856e74
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qtsupport/qtparser.cpp')
| -rw-r--r-- | src/plugins/qtsupport/qtparser.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/plugins/qtsupport/qtparser.cpp b/src/plugins/qtsupport/qtparser.cpp index 89a237b2a16..1c4a90083db 100644 --- a/src/plugins/qtsupport/qtparser.cpp +++ b/src/plugins/qtsupport/qtparser.cpp @@ -39,7 +39,7 @@ using ProjectExplorer::Task; #define FILE_PATTERN "^(([A-Za-z]:)?[^:]+\\.[^:]+)" QtParser::QtParser() : - m_mocRegExp(QLatin1String(FILE_PATTERN"[:\\(](\\d+)\\)?:\\s([Ww]arning|[Ee]rror):\\s(.+)$")), + m_mocRegExp(QLatin1String(FILE_PATTERN"[:\\(](\\d+)\\)?:\\s([Ww]arning|[Ee]rror|[Nn]ote):\\s(.+)$")), m_translationRegExp(QLatin1String("^([Ww]arning|[Ee]rror):\\s+(.*) in '(.*)'$")) { setObjectName(QLatin1String("QtParser")); @@ -56,8 +56,11 @@ void QtParser::stdError(const QString &line) if (!ok) lineno = -1; Task::TaskType type = Task::Error; - if (m_mocRegExp.cap(4).compare(QLatin1String("Warning"), Qt::CaseInsensitive) == 0) + const QString level = m_mocRegExp.cap(4); + if (level.compare(QLatin1String("Warning"), Qt::CaseInsensitive) == 0) type = Task::Warning; + if (level.compare(QLatin1String("Note"), Qt::CaseInsensitive) == 0) + type = Task::Unknown; Task task(type, m_mocRegExp.cap(5).trimmed() /* description */, Utils::FileName::fromUserInput(m_mocRegExp.cap(1)) /* filename */, lineno, @@ -154,6 +157,15 @@ void QtSupportPlugin::testQtOutputParser_data() Utils::FileName::fromUserInput(QLatin1String("c:\\code\\test.h")), 96, ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) << QString(); + QTest::newRow("moc note") + << QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.") + << OutputParserTester::STDERR + << QString() << QString() + << (QList<ProjectExplorer::Task>() << Task(Task::Unknown, + QLatin1String("No relevant classes found. No output generated."), + Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0, + ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) + << QString(); QTest::newRow("ninja with moc") << QString::fromLatin1("E:/sandbox/creator/loaden/src/libs/utils/iwelcomepage.h(54): Error: Undefined interface") << OutputParserTester::STDERR |