Commit 7c7d26da authored by Kai Koehne's avatar Kai Koehne

Also parse for qml errors in qrc files

Task-number: QTCREATORBUG-11475
Change-Id: I70a559a02a96f991ffd3bbe245d219b4d3664fcf
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 750dab55
......@@ -41,7 +41,7 @@ using namespace QtSupport;
QtOutputFormatter::QtOutputFormatter(ProjectExplorer::Project *project)
: OutputFormatter()
, m_qmlError(QLatin1String("^(file:///.+" // file url
, m_qmlError(QLatin1String("^((?:file|qrc):///.+" // url
":\\d+" // colon, line
"(?::\\d+)?)" // colon, column (optional)
"[: \t]")) // colon, space or tab
......@@ -187,7 +187,7 @@ void QtOutputFormatter::appendLine(QTextCursor &cursor, LinkResult lr,
void QtOutputFormatter::handleLink(const QString &href)
{
if (!href.isEmpty()) {
QRegExp qmlLineColumnLink(QLatin1String("^(file:///.+)" // file url
QRegExp qmlLineColumnLink(QLatin1String("^((?:file|qrc):///.+)" // url
":(\\d+)" // line
":(\\d+)$")); // column
......@@ -201,7 +201,7 @@ void QtOutputFormatter::handleLink(const QString &href)
return;
}
QRegExp qmlLineLink(QLatin1String("^(file:///.+)" // file url
QRegExp qmlLineLink(QLatin1String("^((?:file|qrc):///.+)" // url
":(\\d+)$")); // line
if (qmlLineLink.indexIn(href) != -1) {
......
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