diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-23 05:13:34 (GMT) |
---|---|---|
committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-23 05:13:34 (GMT) |
commit | aab648826f0a11a93341f29e88c46902d5f31e4d (patch) | |
tree | 11d26e0f7353c66a92c7af23a67bf32782f19332 /src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h | |
parent | 5de213210ef4f14e698c3fd970cf7e6c5b27c72d (diff) | |
parent | eeb116b56f9555458438dfe235b16488db9b1494 (diff) | |
download | Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.zip Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.gz Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.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.h | 5 |
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; |