From d1175f3ea2c305955fbf7ac67e4738f354e437cd Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 7 Oct 2010 13:13:05 +0200 Subject: QmlJSObserver: Fix crash when adding an element to some .qml files Make sure that the 'artifical' URL of the item created actually is absolute (starts with a file:///). Otherwise an Assert will be hit when the imports include e.g. a .js file, and the Engine tries to load it. Task-number: QTCREATORBUG-2644 Reviewed-by: Olivier Goffart --- src/libs/qmljs/qmljsdelta.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libs/qmljs/qmljsdelta.cpp') diff --git a/src/libs/qmljs/qmljsdelta.cpp b/src/libs/qmljs/qmljsdelta.cpp index 6c71e3c5e7..6c44996264 100644 --- a/src/libs/qmljs/qmljsdelta.cpp +++ b/src/libs/qmljs/qmljsdelta.cpp @@ -363,7 +363,8 @@ void Delta::insert(UiObjectMember *member, UiObjectMember *parentMember, const Q importList << doc->source().mid(importBegin, importEnd - importBegin); } - QString filename = doc->fileName() + QLatin1Char('_') + QString::number(doc->editorRevision()) + // encode editorRevision, lineNumber in URL. See ClientProxy::buildDebugIdHashRecursive + QString filename = QLatin1String("file://") + doc->fileName() + QLatin1Char('_') + QString::number(doc->editorRevision()) + QLatin1Char(':') + QString::number(uiObjectDef->firstSourceLocation().startLine-importList.count()); foreach(DebugId debugId, debugReferences) { if (debugId != -1) { -- cgit v1.2.1