diff options
| author | axis <qt-info@nokia.com> | 2009-06-29 12:25:09 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-29 12:25:09 (GMT) |
| commit | 1a8c89e9eaec05e9f38eae4fbc007d8344015de3 (patch) | |
| tree | d87e517cfab9443926841b3ef92ca715a717f54a /src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h | |
| parent | 78166d5235a5045fdc887febe01d789cac333bb3 (diff) | |
| parent | b6171cfbe3b1453a2c46f78db0df4819e4e5e54f (diff) | |
| download | Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.zip Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.tar.gz Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
.gitignore
src/gui/dialogs/qfiledialog_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
tests/auto/network-settings.h
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h index dd64eeb..cefe9e9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h @@ -32,7 +32,7 @@ class JSHTMLAppletElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLAppletElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLAppletElement>); - 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&); bool customGetOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); @@ -56,7 +56,7 @@ private: class JSHTMLAppletElementPrototype : 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; JSHTMLAppletElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } |