diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-10-06 09:53:08 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-10-06 10:58:29 +0200 |
| commit | 909c61247c6bd8ea55852aa4626b84f8c0756aad (patch) | |
| tree | 04bd54ad9111067ea4c03db118ae5387df203c9a /src/libs/qmljs | |
| parent | 21f3a69d4ca4d3d92bbae4b29315ddb1ec4c7e29 (diff) | |
| download | qt-creator-909c61247c6bd8ea55852aa4626b84f8c0756aad.tar.gz | |
QmlJS: Allow 'var' property type.
It's new in Qt 5.
Change-Id: If3e670d42528ca6996ae280d96077ce744d281d9
Reviewed-on: http://codereview.qt-project.org/6121
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/libs/qmljs')
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 3 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljsinterpreter.cpp | 4 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljsvalueowner.cpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index d4c6ae16df..d005978be2 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -115,7 +115,8 @@ public: validBuiltinPropertyNames.insert(QLatin1String("string")); validBuiltinPropertyNames.insert(QLatin1String("time")); validBuiltinPropertyNames.insert(QLatin1String("url")); - validBuiltinPropertyNames.insert(QLatin1String("variant")); + validBuiltinPropertyNames.insert(QLatin1String("var")); + validBuiltinPropertyNames.insert(QLatin1String("variant")); // obsolete in Qt 5 validBuiltinPropertyNames.insert(QLatin1String("vector3d")); validBuiltinPropertyNames.insert(QLatin1String("alias")); } diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index 581f240b0b..d3b3ecd109 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -1853,7 +1853,9 @@ bool ASTPropertyReference::getSourceLocation(QString *fileName, int *line, int * const Value *ASTPropertyReference::value(ReferenceContext *referenceContext) const { if (_ast->statement - && (_ast->memberType.isEmpty() || _ast->memberType == QLatin1String("variant") + && (_ast->memberType.isEmpty() + || _ast->memberType == QLatin1String("variant") + || _ast->memberType == QLatin1String("var") || _ast->memberType == QLatin1String("alias"))) { // Adjust the context for the current location - expensive! diff --git a/src/libs/qmljs/qmljsvalueowner.cpp b/src/libs/qmljs/qmljsvalueowner.cpp index aaa9f4d28b..c2c6974fbf 100644 --- a/src/libs/qmljs/qmljsvalueowner.cpp +++ b/src/libs/qmljs/qmljsvalueowner.cpp @@ -948,6 +948,6 @@ const Value *ValueOwner::defaultValueForBuiltinType(const QString &name) const } else if (name == QLatin1String("date")) { return datePrototype(); } - // ### variant + // ### variant or var return undefinedValue(); } |