From 4c97aff92561c7d2ab0bd0da920f1c3b708158a1 Mon Sep 17 00:00:00 2001
From: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Date: Thu, 20 Aug 2009 13:58:35 +0200
Subject: Fix "fixme" in QtFunction::mark()

QtFunction::mark() does not cause infinite recursion any more.

Reviewed-by: Kent Hansen
---
 src/script/bridge/qscriptqobject.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index ff88921..bb701ce 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -267,9 +267,7 @@ void QtFunction::mark()
 {
     Q_ASSERT(!marked());
     if (data->object && !data->object.marked()) {
-        // FIXME: Causes infinite recursion because the object will mark this function,
-        // which will again mark the object, and so on. Need an "is marking" flag.
-//        data->object.mark();
+        JSC::asObject(data->object)->JSC::JSObject::mark();
     }
     JSC::InternalFunction::mark();
 }
-- 
cgit v0.12