Small cleanup in __qmljs_equal
authorLars Knoll <lars.knoll@digia.com>
Fri, 19 Apr 2013 19:53:08 +0000 (21:53 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Sat, 20 Apr 2013 07:11:25 +0000 (09:11 +0200)
Change-Id: I984c1c0e7255d995866c9c4436b5f4f23a0dfa72
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
src/qml/qml/v4vm/qv4runtime.cpp

index eeb4b41..528ac4e 100644 (file)
@@ -738,9 +738,8 @@ uint __qmljs_equal(const Value &x, const Value &y)
         case Value::String_Type:
             return x.stringValue()->isEqualTo(y.stringValue());
         case Value::Object_Type:
-            if (x.objectValue()->externalComparison || y.objectValue()->externalComparison)
-                return x.objectValue()->externalComparison && y.objectValue()->externalComparison
-                        && x.objectValue()->internalClass->engine->externalResourceComparison(x, y);
+            if (x.objectValue()->externalComparison && y.objectValue()->externalComparison)
+                return x.objectValue()->internalClass->engine->externalResourceComparison(x, y);
             return x.objectValue() == y.objectValue();
         default: // double
             return x.doubleValue() == y.doubleValue();