aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/v8/qv8variantwrapper.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-07-01 16:31:05 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-01 08:32:43 +0200
commit628a5cd0669dbfb6a4f2b60f5b59b044f8ca2bbb (patch)
tree5c6a7dc2b130b71c1d029fb2f051d63728928b60 /src/declarative/qml/v8/qv8variantwrapper.cpp
parentce8a1ef6f1a2868c6e4c19a56e94ca623b6b9889 (diff)
Variants should compare as equal
We need to implement an object comparison callback to ensure that two variants with identical values (although different JS objects) compare as equal. We also add a v8 autotest for this callback. Change-Id: Idd1ab602d31b398a937d4df4a7bd091aa205de24 Reviewed-on: http://codereview.qt.nokia.com/989 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8/qv8variantwrapper.cpp')
-rw-r--r--src/declarative/qml/v8/qv8variantwrapper.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/v8/qv8variantwrapper.cpp b/src/declarative/qml/v8/qv8variantwrapper.cpp
index 9d486d05b7..a5602fbbad 100644
--- a/src/declarative/qml/v8/qv8variantwrapper.cpp
+++ b/src/declarative/qml/v8/qv8variantwrapper.cpp
@@ -76,6 +76,7 @@ void QV8VariantWrapper::init(QV8Engine *engine)
v8::Local<v8::FunctionTemplate> ft = v8::FunctionTemplate::New();
ft->InstanceTemplate()->SetFallbackPropertyHandler(Getter, Setter);
ft->InstanceTemplate()->SetHasExternalResource(true);
+ ft->InstanceTemplate()->MarkAsUseUserObjectComparison();
ft->InstanceTemplate()->SetAccessor(v8::String::New("toString"), ToStringGetter, 0,
m_toString, v8::DEFAULT,
v8::PropertyAttribute(v8::ReadOnly | v8::DontDelete));
@@ -87,6 +88,7 @@ void QV8VariantWrapper::init(QV8Engine *engine)
v8::Local<v8::FunctionTemplate> ft = v8::FunctionTemplate::New();
ft->InstanceTemplate()->SetFallbackPropertyHandler(Getter, Setter);
ft->InstanceTemplate()->SetHasExternalResource(true);
+ ft->InstanceTemplate()->MarkAsUseUserObjectComparison();
ft->InstanceTemplate()->SetAccessor(v8::String::New("preserve"), PreserveGetter, 0,
m_preserve, v8::DEFAULT,
v8::PropertyAttribute(v8::ReadOnly | v8::DontDelete));