diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-30 09:22:27 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-30 09:22:27 (GMT) |
| commit | 4d0bc04cc2aa6fa6a5b18d53bdfcc8b02708d82b (patch) | |
| tree | 102f342b147eb0f2d3ef3e763d37224a5e4e2fbb /src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h | |
| parent | 86d6bbd43601404bc13ee75ea5143add7947a563 (diff) | |
| parent | 8aaeb297d8d0dc406c0df9ae35558c9b51e9e6a3 (diff) | |
| download | Qt-4d0bc04cc2aa6fa6a5b18d53bdfcc8b02708d82b.zip Qt-4d0bc04cc2aa6fa6a5b18d53bdfcc8b02708d82b.tar.gz Qt-4d0bc04cc2aa6fa6a5b18d53bdfcc8b02708d82b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h index 9f1ca08..1d8b7a0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h +++ b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h @@ -34,7 +34,7 @@ class JSJavaScriptCallFrame : public DOMObject { public: JSJavaScriptCallFrame(PassRefPtr<JSC::Structure>, PassRefPtr<JavaScriptCallFrame>); virtual ~JSJavaScriptCallFrame(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -63,7 +63,7 @@ JavaScriptCallFrame* toJavaScriptCallFrame(JSC::JSValuePtr); class JSJavaScriptCallFramePrototype : public JSC::JSObject { public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); 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&); |