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

qmljs: use new qml parser

Browse Source 
adds support for singleton and getter/setter properties

Change-Id: Ia6691ac7799a46885db0df44617617dcc3c13189
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-11-06 14:17:23 +01:00
parent 0374d83e83
commit e9c97aa1d1
35 changed files with 2420 additions and 1675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/qmljs/qmljsdelta.cpp
View File

@@ -363,11 +363,12 @@ void Delta::insert(UiObjectMember *member, UiObjectMember *parentMember, const Q
qmlText += doc->source().midRef(begin, end - begin);
QStringList importList;
for (UiImportList *it = doc->qmlProgram()->imports; it; it = it->next) {
if (!it->import)
for (UiHeaderItemList *it = doc->qmlProgram()->headers; it; it = it->next) {
UiImport *import = AST::cast<UiImport *>(it->headerItem);
if (!import)
continue;
unsigned importBegin = it->import->firstSourceLocation().begin();
unsigned importEnd = it->import->lastSourceLocation().end();
unsigned importBegin = import->firstSourceLocation().begin();
unsigned importEnd = import->lastSourceLocation().end();
importList << doc->source().mid(importBegin, importEnd - importBegin);
}