diff options
| -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 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljshighlighter.cpp | 2 |
4 files changed, 8 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(); } diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp index 925c968712..b0ab97856c 100644 --- a/src/plugins/qmljseditor/qmljshighlighter.cpp +++ b/src/plugins/qmljseditor/qmljshighlighter.cpp @@ -266,6 +266,8 @@ bool Highlighter::maybeQmlBuiltinType(const QStringRef &text) const return true; } else if (ch == QLatin1Char('v') && text == QLatin1String("variant")) { return true; + } else if (ch == QLatin1Char('v') && text == QLatin1String("var")) { + return true; } else if (ch == QLatin1Char('v') && text == QLatin1String("vector3d")) { return true; } else { |