Commit 862637cc authored by Alessandro Portale's avatar Alessandro Portale
Browse files

Fix qml application output "jump-to-qml-error" for Windows.

Works on Windows now. Done with and reviewed by dt, so blame him
if it is now broken on Unix.

Done-with: dt
parent 667e8aa0
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <qt4projectmanager/qt4project.h> #include <qt4projectmanager/qt4project.h>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QtCore/QUrl>
#include <QtGui/QPlainTextEdit> #include <QtGui/QPlainTextEdit>
using namespace ProjectExplorer; using namespace ProjectExplorer;
...@@ -40,7 +41,7 @@ using namespace Qt4ProjectManager; ...@@ -40,7 +41,7 @@ using namespace Qt4ProjectManager;
QtOutputFormatter::QtOutputFormatter(Qt4Project *project) QtOutputFormatter::QtOutputFormatter(Qt4Project *project)
: OutputFormatter() : OutputFormatter()
, m_qmlError(QLatin1String("(file:///[^:]+:\\d+:\\d+):")) , m_qmlError(QLatin1String("(file:///.+:\\d+:\\d+):"))
, m_qtError(QLatin1String("Object::.*in (.*:\\d+)")) , m_qtError(QLatin1String("Object::.*in (.*:\\d+)"))
, m_project(project) , m_project(project)
...@@ -149,10 +150,10 @@ void QtOutputFormatter::appendLine(LinkResult lr, const QString &line, bool onSt ...@@ -149,10 +150,10 @@ void QtOutputFormatter::appendLine(LinkResult lr, const QString &line, bool onSt
void QtOutputFormatter::handleLink(const QString &href) void QtOutputFormatter::handleLink(const QString &href)
{ {
if (!href.isEmpty()) { if (!href.isEmpty()) {
QRegExp qmlErrorLink(QLatin1String("^file://(/[^:]+):(\\d+):(\\d+)")); const QRegExp qmlErrorLink(QLatin1String("^(file:///.+):(\\d+):(\\d+)"));
if (qmlErrorLink.indexIn(href) != -1) { if (qmlErrorLink.indexIn(href) != -1) {
const QString fileName = qmlErrorLink.cap(1); const QString fileName = QUrl(qmlErrorLink.cap(1)).toLocalFile();
const int line = qmlErrorLink.cap(2).toInt(); const int line = qmlErrorLink.cap(2).toInt();
const int column = qmlErrorLink.cap(3).toInt(); const int column = qmlErrorLink.cap(3).toInt();
TextEditor::BaseTextEditor::openEditorAt(fileName, line, column - 1); TextEditor::BaseTextEditor::openEditorAt(fileName, line, column - 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