summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-10-28 08:45:04 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-10-28 08:45:04 (GMT)
commit1ec19ed5a69b8b0e11c81037c270072736f48e40 (patch)
tree869800a523b46e527d04c9973f36e294dd101978 /src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
parent0444453661df0f56fd034778028c7abdc0b621cc (diff)
parent1583d643285641bf71e6a107331d788acca9850c (diff)
downloadQt-1ec19ed5a69b8b0e11c81037c270072736f48e40.zip
Qt-1ec19ed5a69b8b0e11c81037c270072736f48e40.tar.gz
Qt-1ec19ed5a69b8b0e11c81037c270072736f48e40.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-driven
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
index 86f2f32..d19890a 100644
--- a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
+++ b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
@@ -50,9 +50,12 @@ public:
static PassRefPtr<Structure> createStructure(JSValue proto)
{
- return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance | OverridesHasInstance));
+ return Structure::create(proto, TypeInfo(ObjectType, StructureFlags));
}
+protected:
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | ImplementsHasInstance | OverridesHasInstance | OverridesMarkChildren | OverridesGetPropertyNames | Base::StructureFlags;
+
private:
virtual UString className() const;