summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-10-26 07:06:59 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-10-26 07:06:59 (GMT)
commit9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427 (patch)
tree37ae0ceb0eb9d4f74683b02bf3187cfd7f694c6c /src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
parent2c0921b667ec74df6ad3d749b30bb9b7c5843343 (diff)
parent35c8033ff51ab6d0567e786b790b8cc49852803b (diff)
downloadQt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.zip
Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.tar.gz
Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
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;