feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

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

Done-with: dt
This commit is contained in:
Alessandro Portale
2010-08-05 21:03:37 +02:00
parent 667e8aa01f
commit 862637cc17
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/qtoutputformatter.cpp
View File

@@ -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;
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
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);