From 26fc680ab4344d1c14756459ab92c0413aebf99c Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 7 Oct 2009 17:43:07 +1000
Subject: Add Object.destroy(int delay) parameter

---
 src/declarative/qml/qmlobjectscriptclass.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index 2d69590..ce74aef 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -46,6 +46,7 @@
 #include <private/qmldeclarativedata_p.h>
 #include <private/qmltypenamescriptclass_p.h>
 #include <QtDeclarative/qmlbinding.h>
+#include <QtCore/qtimer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -290,9 +291,10 @@ QScriptValue QmlObjectScriptClass::destroy(QScriptContext *context, QScriptEngin
         int delay = 0;
         if(context->argumentCount() > 0)
             delay = context->argument(0).toInt32();
-        obj->deleteLater();
-        //### Should this be delayed as well?
-        context->thisObject().setData(QScriptValue(engine, 0));
+        if (delay > 0)
+            QTimer::singleShot(delay, obj, SLOT(deleteLater()));
+        else
+            obj->deleteLater();
     }
     return engine->nullValue();
 }
-- 
cgit v0.12