From: Lars Knoll <lars.knoll@digia.com>
Date: Mon, 14 Jan 2013 21:01:01 +0000 (+0100)
Subject: Fix PropertyDescriptor::isSubset()
X-Git-Tag: upstream/5.2.1~669^2~659^2~523
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73bcaf2318f20faca8a8a97f89ed2f8fb9fe12d4;p=platform%2Fupstream%2Fqtdeclarative.git

Fix PropertyDescriptor::isSubset()

This fixes a couple of test cases where an accessor
gets reset to undefined.

Change-Id: If37d67846a31bfcec5d285ad68337748a243b5ff
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---

diff --git a/qv4propertydescriptor.h b/qv4propertydescriptor.h
index 8aa3716..0f14a15 100644
--- a/qv4propertydescriptor.h
+++ b/qv4propertydescriptor.h
@@ -136,9 +136,9 @@ struct PropertyDescriptor {
         if (type == Data && !value.sameValue(other->value))
             return false;
         if (type == Accessor) {
-            if ((quintptr)get != 0x1 && get != other->get)
+            if (get != other->get)
                 return false;
-            if ((quintptr)set != 0x1 && set != other->set)
+            if (set != other->set)
                 return false;
         }
         return true;
diff --git a/tests/TestExpectations b/tests/TestExpectations
index 349066a..cb07b97 100644
--- a/tests/TestExpectations
+++ b/tests/TestExpectations
@@ -823,15 +823,11 @@ S15.1.3.2_A5.3 failing
 15.2.3.6-3-66 failing
 15.2.3.6-3-94-1 failing
 15.2.3.6-3-94 failing
-15.2.3.6-4-108 failing
-15.2.3.6-4-111 failing
 15.2.3.6-4-163 failing
 15.2.3.6-4-188 failing
 15.2.3.6-4-189 failing
 15.2.3.6-4-20 failing
 15.2.3.6-4-256 failing
-15.2.3.6-4-266 failing
-15.2.3.6-4-269 failing
 15.2.3.6-4-291-1 failing
 15.2.3.6-4-292-1 failing
 15.2.3.6-4-293-2 failing
@@ -846,13 +842,9 @@ S15.1.3.2_A5.3 failing
 15.2.3.6-4-360-7 failing
 15.2.3.6-4-41 failing
 15.2.3.6-4-410 failing
-15.2.3.6-4-463 failing
 15.2.3.6-4-472 failing
-15.2.3.6-4-481 failing
 15.2.3.6-4-490 failing
-15.2.3.6-4-498 failing
 15.2.3.6-4-507 failing
-15.2.3.6-4-516 failing
 15.2.3.6-4-525 failing
 15.2.3.6-4-543 failing
 15.2.3.6-4-544 failing
@@ -936,8 +928,6 @@ S15.1.3.2_A5.3 failing
 15.2.3.7-6-a-244 failing
 15.2.3.7-6-a-245 failing
 15.2.3.7-6-a-25 failing
-15.2.3.7-6-a-255 failing
-15.2.3.7-6-a-258 failing
 15.2.3.7-6-a-270 failing
 15.2.3.7-6-a-271 failing
 15.2.3.7-6-a-272 failing
@@ -2974,4 +2964,4 @@ S15.4.4.13_A1_T2 failing
 15.4.4.19-8-c-i-6 failing
 15.4.4.20-9-c-i-6 failing
 15.4.4.21-8-b-iii-1-6 failing
-15.4.4.22-8-b-iii-1-6 failing
+15.4.4.22-8-b-iii-1-6 failing
\ No newline at end of file