From 61b3a7beb81ef813368766c672d95a68cfdf17f5 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 16 Apr 2010 12:41:38 +0200
Subject: [PATCH] Do not consider "In constructor foo" lines as errors
... in the ldparser.
---
src/plugins/projectexplorer/gccparser.cpp | 11 +++++++++++
src/plugins/projectexplorer/ldparser.cpp | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp
index c6a91277b5c..e2ee1e14801 100644
--- a/src/plugins/projectexplorer/gccparser.cpp
+++ b/src/plugins/projectexplorer/gccparser.cpp
@@ -438,6 +438,17 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
QLatin1String("main.cpp"), 10,
Constants::TASK_CATEGORY_COMPILE))
<< QString();
+ QTest::newRow("In constructor")
+ << QString::fromLatin1("/dev/creator/src/plugins/find/basetextfind.h: In constructor 'Find::BaseTextFind::BaseTextFind(QTextEdit*)':")
+ << OutputParserTester::STDERR
+ << QString() << QString()
+ << ( QList<ProjectExplorer::Task>()
+ << Task(Task::Unknown,
+ QLatin1String("In constructor 'Find::BaseTextFind::BaseTextFind(QTextEdit*)':"),
+ QLatin1String("/dev/creator/src/plugins/find/basetextfind.h"), -1,
+ Constants::TASK_CATEGORY_COMPILE))
+ << QString();
+
QTest::newRow("At global scope")
<< QString::fromLatin1("../../scriptbug/main.cpp: At global scope:\n"
"../../scriptbug/main.cpp: In instantiation of void bar(i) [with i = double]:\n"
diff --git a/src/plugins/projectexplorer/ldparser.cpp b/src/plugins/projectexplorer/ldparser.cpp
index 7f4f2f3689d..08cfb827354 100644
--- a/src/plugins/projectexplorer/ldparser.cpp
+++ b/src/plugins/projectexplorer/ldparser.cpp
@@ -98,7 +98,7 @@ void LdParser::stdError(const QString &line)
if (m_regExpInFunction.indexIn(description) > -1 ||
description.startsWith(QLatin1String("At global scope")) ||
description.startsWith(QLatin1String("instantiated from ")) ||
- description.startsWith(QLatin1String("In instantiation of ")))
+ description.startsWith(QLatin1String("In ")))
task.type = Task::Unknown;
emit addTask(task);
--
GitLab