From 84eeb79896cc7bf7a27706a028faa69890f5d999 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 30 Mar 2011 13:04:54 +0200
Subject: [PATCH] ApplicationOutput: Fix linkification of errors from qttest
Don't check for end of string (does contain LF in case of qttestlib).
Also don't check prefix for asserts, cause qttestlib extends these.
Reviewed-by: Tobias Hunger
---
src/plugins/qt4projectmanager/qtoutputformatter.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtoutputformatter.cpp b/src/plugins/qt4projectmanager/qtoutputformatter.cpp
index f85f311642f..1dae5e5a9f1 100644
--- a/src/plugins/qt4projectmanager/qtoutputformatter.cpp
+++ b/src/plugins/qt4projectmanager/qtoutputformatter.cpp
@@ -53,9 +53,8 @@ QtOutputFormatter::QtOutputFormatter(ProjectExplorer::Project *project)
"(?::\\d+)?)" // colon, column (optional)
":")) // colon
, m_qtError(QLatin1String("Object::.*in (.*:\\d+)"))
- , m_qtAssert(QLatin1String("^(?:\\[Qt Message\\] )?" // '[Qt Message] ' prefix (optional, on Symbian)
- "ASSERT: .* in file (.+, line \\d+)$"))
- , m_qtTestFail(QLatin1String("^ Loc: \\[(.*)\\]$"))
+ , m_qtAssert(QLatin1String("ASSERT: .* in file (.+, line \\d+)"))
+ , m_qtTestFail(QLatin1String("^ Loc: \\[(.*)\\]"))
, m_project(project)
{
if(project) {
--
GitLab