diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2021-05-07 10:57:24 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-05-07 14:15:11 +0000 |
| commit | a0e3f4bcc5a1fd4ef16c1d3b110dfa43393c3f03 (patch) | |
| tree | a2cb9a72a80ef5085ea611c3444d470270702663 | |
| parent | c262f40b67ec80733cf973924a865110fe2fdeae (diff) | |
| download | qt-creator-a0e3f4bcc5a1fd4ef16c1d3b110dfa43393c3f03.tar.gz | |
ProjectExplorer: Do not look for compiler messages in LdParser
Task-number: QTCREATORBUG-25677
Change-Id: I33ff8adc1267a59787b0d7007a0733f649bfcec6
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/plugins/projectexplorer/gccparser.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/ldparser.cpp | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp index 6e732a0b92..b371133de3 100644 --- a/src/plugins/projectexplorer/gccparser.cpp +++ b/src/plugins/projectexplorer/gccparser.cpp @@ -49,7 +49,7 @@ GccParser::GccParser() QTC_CHECK(m_regExp.isValid()); m_regExpScope.setPattern(QLatin1Char('^') + FILE_PATTERN - + "(?:(\\d+):)?(\\d+:)?\\s+((?:In .*(?:function|constructor) .*|At global scope):)$"); + + "(?:(\\d+):)?(\\d+:)?\\s+((?:In .*(?:function|constructor) .*|At global scope|At top level):)$"); QTC_CHECK(m_regExpScope.isValid()); m_regExpIncluded.setPattern(QString::fromLatin1("\\bfrom\\s") + QLatin1String(FILE_PATTERN) diff --git a/src/plugins/projectexplorer/ldparser.cpp b/src/plugins/projectexplorer/ldparser.cpp index afbdf985aa..2d85f8f28c 100644 --- a/src/plugins/projectexplorer/ldparser.cpp +++ b/src/plugins/projectexplorer/ldparser.cpp @@ -133,11 +133,7 @@ Utils::OutputLineParser::Result LdParser::handleLine(const QString &line, Utils: } QString description = match.captured(8).trimmed(); Task::TaskType type = Task::Error; - if (description.startsWith(QLatin1String("At global scope")) || - description.startsWith(QLatin1String("At top level")) || - description.startsWith(QLatin1String("instantiated from ")) || - description.startsWith(QLatin1String("In ")) || - description.startsWith(QLatin1String("first defined here")) || + if (description.startsWith(QLatin1String("first defined here")) || description.startsWith(QLatin1String("note:"), Qt::CaseInsensitive)) { type = Task::Unknown; } else if (description.startsWith(QLatin1String("warning: "), Qt::CaseInsensitive)) { |