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

Updated the QML/JS front-end.

Browse Source
This commit is contained in:
Roberto Raggi
2010-03-03 11:38:33 +01:00
parent 08b9323f0c
commit 26e4672bc6
18 changed files with 1187 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/qmljs/parser/qmljsast_p.h
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -2599,11 +2599,17 @@ public:
UiObjectInitializer *initializer)
: qualifiedId(qualifiedId),
qualifiedTypeNameId(qualifiedTypeNameId),
initializer(initializer)
initializer(initializer),
hasOnToken(false)
{ kind = K; }
virtual SourceLocation firstSourceLocation() const
{ return qualifiedId->identifierToken; }
{
if (hasOnToken && qualifiedTypeNameId)
return qualifiedTypeNameId->identifierToken;
return qualifiedId->identifierToken;
}
virtual SourceLocation lastSourceLocation() const
{ return initializer->rbraceToken; }
@@ -2615,6 +2621,7 @@ public:
UiQualifiedId *qualifiedTypeNameId;
UiObjectInitializer *initializer;
SourceLocation colonToken;
bool hasOnToken;
};
class QML_PARSER_EXPORT UiScriptBinding: public UiObjectMember