summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h
diff options
context:
space:
mode:
authorninerider <qt-info@nokia.com>2009-10-01 11:11:56 (GMT)
committerninerider <qt-info@nokia.com>2009-10-01 11:11:56 (GMT)
commitc443a37d638be253fbda33e33ad2798951e04248 (patch)
tree89a9d221ead07d029f0bbddcaeaf7432b8c6d4af /src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h
parentc7689f394df5fa5526e51017bf132048d3a4aa96 (diff)
parent3b37aff1e6c641290c155a6aa14d83167725556b (diff)
downloadQt-c443a37d638be253fbda33e33ad2798951e04248.zip
Qt-c443a37d638be253fbda33e33ad2798951e04248.tar.gz
Qt-c443a37d638be253fbda33e33ad2798951e04248.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h
index 0705a69..65c9803 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h
@@ -34,7 +34,7 @@ namespace JSC {
class JSONObject : public JSObject {
public:
- JSONObject(PassRefPtr<Structure> structure)
+ JSONObject(NonNullPassRefPtr<Structure> structure)
: JSObject(structure)
{
}