diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-09-23 01:44:14 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-09-23 01:44:14 (GMT) |
| commit | b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b (patch) | |
| tree | a1fc6a13d896327a44390c00c89ba8c4ad205234 /src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h | |
| parent | c60dfe1f2732670eb48d98c9772815d37a16ec3c (diff) | |
| parent | 1dfabbbb1b740060444a11cd894561aed3a884ad (diff) | |
| download | Qt-b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b.zip Qt-b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b.tar.gz Qt-b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qml.pri
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h index 3dff1bc..bd63cf5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h +++ b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h @@ -39,6 +39,7 @@ public: virtual ~JSJavaScriptCallFrame(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -71,9 +72,10 @@ public: virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); + virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&); static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { - return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, JSC::HasDefaultMark)); } JSJavaScriptCallFramePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } }; |