summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-10-01 11:38:33 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-10-01 11:38:33 (GMT)
commit7878afcb88ad723550b56a796ee4070025bf92f9 (patch)
treeab607edd0a24678b9dba785ba3cafa2d4a4cf1c0 /src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
parent09df1ded0bc52700b19b19edf17f7dff5a16a2d9 (diff)
parent3f711d2a40224f7f4d609fdb60d26ad79998da59 (diff)
downloadQt-7878afcb88ad723550b56a796ee4070025bf92f9.zip
Qt-7878afcb88ad723550b56a796ee4070025bf92f9.tar.gz
Qt-7878afcb88ad723550b56a796ee4070025bf92f9.tar.bz2
Merge branch '4.6' of git@scm.dev.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.h2
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();