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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Change-Id: Iab67dffe64bee391bd921ed8832bb17b36ec861b
This commit is contained in:
Eike Ziller
2022-02-14 09:58:04 +01:00
parent f555285aa5 81218043d0
commit 45b5341cd9
37 changed files with 404 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1333,7 +1333,17 @@ static bool isIntegerValue(const Value *value)
if (value->asNumberValue() || value->asIntValue())
return true;
if (auto obj = value->asObjectValue())
return obj->className() == "Number";
return obj->className() == "Number" || obj->className() == "int";
return false;
}
static bool isStringValue(const Value *value)
{
if (value->asStringValue())
return true;
if (auto obj = value->asObjectValue())
return obj->className() == "QString" || obj->className() == "string";
return false;
}
@@ -1349,6 +1359,8 @@ static bool strictCompareConstant(const Value *lhs, const Value *rhs)
return false;
if (isIntegerValue(lhs) && isIntegerValue(rhs))
return false;
if (isStringValue(lhs) && isStringValue(rhs))
return false;
if (lhs->asBooleanValue() && !rhs->asBooleanValue())
return true;
if (lhs->asNumberValue() && !rhs->asNumberValue())