Merge remote-tracking branch 'origin/7.0'

Change-Id: I01ce83a2da66bb65af37c0ecc92372789cb85c01

1 files changed, 13 insertions, 1 deletions

diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index c5a186bda8..aae32a6dd9 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -1350,7 +1350,17 @@ static bool isStringValue(const Value *value)
     if (value->asStringValue())
         return true;
     if (auto obj = value->asObjectValue())
-        return obj->className() == "QString" || obj->className() == "string";
+        return obj->className() == "QString" || obj->className() == "string" || obj->className() == "String";
+
+    return false;
+}
+
+static bool isBooleanValue(const Value *value)
+{
+    if (value->asBooleanValue())
+        return true;
+    if (auto obj = value->asObjectValue())
+        return obj->className() == "boolean" || obj->className() == "Boolean";
 
     return false;
 }
@@ -1368,6 +1378,8 @@ static bool strictCompareConstant(const Value *lhs, const Value *rhs)
         return false;
     if (isStringValue(lhs) && isStringValue(rhs))
         return false;
+    if (isBooleanValue(lhs) && isBooleanValue(rhs))
+        return false;
     if (lhs->asBooleanValue() && !rhs->asBooleanValue())
         return true;
     if (lhs->asNumberValue() && !rhs->asNumberValue())