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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: I0194bdeda71e33fd5bc9cb3eb7a9198ae72815ed
This commit is contained in:
Eike Ziller
2017-11-07 15:10:36 +01:00
parent 8515fd13e3 83ff62aa13
commit a9e4e3608e
121 changed files with 638 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1044,15 +1044,20 @@ bool Check::visit(UiPublicMember *ast)
{
if (ast->type == UiPublicMember::Property) {
if (ast->isValid()) {
const QStringRef name = ast->memberTypeName();
if (!name.isEmpty() && name.at(0).isLower()) {
const QString nameS = name.toString();
if (!isValidBuiltinPropertyType(nameS))
addMessage(ErrInvalidPropertyType, ast->typeToken, nameS);
const QStringRef typeName = ast->memberTypeName();
if (!typeName.isEmpty() && typeName.at(0).isLower()) {
const QString typeNameS = typeName.toString();
if (!isValidBuiltinPropertyType(typeNameS))
addMessage(ErrInvalidPropertyType, ast->typeToken, typeNameS);
}
const QStringRef name = ast->name;
if (name == "data")
addMessage(ErrInvalidPropertyName, ast->identifierToken, name.toString());
// warn about dubious use of var/variant
if (name == QLatin1String("variant") || name == QLatin1String("var")) {
if (typeName == QLatin1String("variant") || typeName == QLatin1String("var")) {
Evaluate evaluator(&_scopeChain);
const Value *init = evaluator(ast->statement);
QString preferredType;