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

QmlJS: Allow 'var' property type.

Browse Source 
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>
This commit is contained in:
Christian Kamm
2011-10-06 09:53:08 +02:00
parent 21f3a69d4c
commit 909c61247c
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/qmljs/qmljscheck.cpp
View File

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

4
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -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!

2
src/libs/qmljs/qmljsvalueowner.cpp
View File

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