diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-05 11:04:24 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-05 11:04:24 (GMT) |
| commit | 4d33c51bf00be826b8036f58cd9aea0c1f44f8ce (patch) | |
| tree | 99339183e160058b996580157d8ed89bd6809562 /src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h | |
| parent | badcaa75b4a5e5dfbb85f5abf856abcfcfa20533 (diff) | |
| parent | b0e6c5ca48c76fb17dca986e9e07adebde390e29 (diff) | |
| download | Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.zip Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.tar.gz Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
tools/assistant/translations/translations_adp.pro
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
tools/qdoc3/test/qt.qdocconf
translations/assistant_adp_de.ts
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 bd63cf5..c958ee0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h +++ b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h @@ -35,7 +35,7 @@ class JavaScriptCallFrame; class JSJavaScriptCallFrame : public DOMObjectWithGlobalPointer { typedef DOMObjectWithGlobalPointer Base; public: - JSJavaScriptCallFrame(PassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<JavaScriptCallFrame>); + JSJavaScriptCallFrame(NonNullPassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<JavaScriptCallFrame>); virtual ~JSJavaScriptCallFrame(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -77,7 +77,7 @@ public: { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, JSC::HasDefaultMark)); } - JSJavaScriptCallFramePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } + JSJavaScriptCallFramePrototype(NonNullPassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } }; // Functions |