diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-02 09:40:07 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-02 09:40:07 (GMT) |
| commit | cfd31c28f2e30ee725d23c36ea8349f984b57047 (patch) | |
| tree | 5fcf867475a6fde5b884c9236350460cee0ed95f /src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h | |
| parent | 46c17756dfa231d5ce7a8907330d97807880a04c (diff) | |
| parent | fe85e470d76f6e53759d0fd508e858add5de1eb0 (diff) | |
| download | Qt-cfd31c28f2e30ee725d23c36ea8349f984b57047.zip Qt-cfd31c28f2e30ee725d23c36ea8349f984b57047.tar.gz Qt-cfd31c28f2e30ee725d23c36ea8349f984b57047.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h index 47fd6c3..86f2f32 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h @@ -36,7 +36,7 @@ namespace JSC { template <class Base> class JSCallbackObject : public Base { public: - JSCallbackObject(ExecState*, PassRefPtr<Structure>, JSClassRef, void* data); + JSCallbackObject(ExecState*, NonNullPassRefPtr<Structure>, JSClassRef, void* data); JSCallbackObject(JSClassRef); virtual ~JSCallbackObject(); |