Commit ef457502 authored by Daniel Teske's avatar Daniel Teske

Fix detection of qml runtime error messages on Android

On Android those messages are prepended by e.g. W/libuntitled156.
Adjust the regexp to also match in the middle of the line.

Change-Id: Idd2ed8f4de8f4070da4fc673051eb29efe72fa66
Task-number: QTCREATORBUG-14832
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent f2b37668
...@@ -57,10 +57,10 @@ class QtOutputFormatterPrivate ...@@ -57,10 +57,10 @@ class QtOutputFormatterPrivate
{ {
public: public:
QtOutputFormatterPrivate(Project *proj) QtOutputFormatterPrivate(Project *proj)
: qmlError(QLatin1String("^(" QML_URL_REGEXP // url : qmlError(QLatin1String("(" QML_URL_REGEXP // url
":\\d+" // colon, line ":\\d+" // colon, line
"(?::\\d+)?)" // colon, column (optional) "(?::\\d+)?)" // colon, column (optional)
"[: \t]")) // colon, space or tab "[: \t]")) // colon, space or tab
, qtError(QLatin1String("Object::.*in (.*:\\d+)")) , qtError(QLatin1String("Object::.*in (.*:\\d+)"))
, qtAssert(QLatin1String("ASSERT: .* in file (.+, line \\d+)")) , qtAssert(QLatin1String("ASSERT: .* in file (.+, line \\d+)"))
, qtAssertX(QLatin1String("ASSERT failure in .*: \".*\", file (.+, line \\d+)")) , qtAssertX(QLatin1String("ASSERT failure in .*: \".*\", file (.+, line \\d+)"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment