From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Mon, 28 Jun 2010 16:42:48 +0100 Subject: Merge WebKit at r61871: Initial merge by git. Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5 --- JavaScriptCore/qt/api/qscriptengine_p.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'JavaScriptCore/qt/api/qscriptengine_p.cpp') diff --git a/JavaScriptCore/qt/api/qscriptengine_p.cpp b/JavaScriptCore/qt/api/qscriptengine_p.cpp index a6cf4a4..fd7978b 100644 --- a/JavaScriptCore/qt/api/qscriptengine_p.cpp +++ b/JavaScriptCore/qt/api/qscriptengine_p.cpp @@ -85,5 +85,5 @@ QScriptValuePrivate* QScriptEnginePrivate::newObject() const QScriptValuePrivate* QScriptEnginePrivate::globalObject() const { JSObjectRef globalObject = JSContextGetGlobalObject(m_context); - return new QScriptValuePrivate(this, globalObject, globalObject); + return new QScriptValuePrivate(this, globalObject); } -- cgit v1.1