From f6c862db4905050f70abf6ebf9af46416ad6f873 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 4 Feb 2011 16:41:16 +0100
Subject: [PATCH] Fix linkification of Asserts and QML errors for Symbian
Output
On Symbian Qt errors are prefixed with '[Qt Message] '
Task-number: QTCREATORBUG-3694
---
src/plugins/qt4projectmanager/qtoutputformatter.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtoutputformatter.cpp b/src/plugins/qt4projectmanager/qtoutputformatter.cpp
index 39faa48a404..14cba0903b0 100644
--- a/src/plugins/qt4projectmanager/qtoutputformatter.cpp
+++ b/src/plugins/qt4projectmanager/qtoutputformatter.cpp
@@ -47,12 +47,14 @@ using namespace Qt4ProjectManager;
QtOutputFormatter::QtOutputFormatter(ProjectExplorer::Project *project)
: OutputFormatter()
- , m_qmlError(QLatin1String("^(file:///.+" // file url
+ , m_qmlError(QLatin1String("^(?:\\[Qt Message\\] )?" // '[Qt Message] ' prefix (optional, on Symbian)
+ "(file:///.+" // file url
":\\d+" // colon, line
"(?::\\d+)?)" // colon, column (optional)
":")) // colon
, m_qtError(QLatin1String("Object::.*in (.*:\\d+)"))
- , m_qtAssert(QLatin1String("^ASSERT: .* in file (.+, line \\d+)$"))
+ , m_qtAssert(QLatin1String("^(?:\\[Qt Message\\] )?" // '[Qt Message] ' prefix (optional, on Symbian)
+ "ASSERT: .* in file (.+, line \\d+)$"))
, m_qtTestFail(QLatin1String("^ Loc: \\[(.*)\\]$"))
, m_project(project)
{
--
GitLab