diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-02-04 16:41:16 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-02-04 16:58:31 +0100 |
| commit | f6c862db4905050f70abf6ebf9af46416ad6f873 (patch) | |
| tree | af1c26e9d33f40cb64559d9f2afc5c0c1b3ba9fb /src/plugins/qt4projectmanager/qtoutputformatter.cpp | |
| parent | 488249c05cc2052274782f441e8bab71d9e9f9bb (diff) | |
| download | qt-creator-f6c862db4905050f70abf6ebf9af46416ad6f873.tar.gz | |
Fix linkification of Asserts and QML errors for Symbian Output
On Symbian Qt errors are prefixed with '[Qt Message] '
Task-number: QTCREATORBUG-3694
Diffstat (limited to 'src/plugins/qt4projectmanager/qtoutputformatter.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qtoutputformatter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qtoutputformatter.cpp b/src/plugins/qt4projectmanager/qtoutputformatter.cpp index 39faa48a40..14cba0903b 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) { |