5 files changed, 41 insertions, 7 deletions

diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index b9fb1f4ffe..54c29b4b8a 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -45,6 +45,7 @@
 #include <private/qqmlstringconverters_p.h>
 #include <private/qqmllocale_p.h>
 #include <private/qv8engine_p.h>
+#include <private/qqmldelayedcallqueue_p.h>
 #include <QFileInfo>
 
 #include <private/qqmldebugconnector_p.h>
@@ -146,6 +147,8 @@ Heap::QtObject::QtObject(QQmlEngine *qmlEngine)
     o->defineAccessorProperty(QStringLiteral("inputMethod"), QV4::QtObject::method_get_inputMethod, 0);
 #endif
     o->defineAccessorProperty(QStringLiteral("styleHints"), QV4::QtObject::method_get_styleHints, 0);
+
+    o->defineDefaultProperty(QStringLiteral("callLater"), QV4::QtObject::method_callLater);
 }
 
 void QtObject::addAll()
@@ -1995,6 +1998,30 @@ ReturnedValue GlobalExtensions::method_string_arg(CallContext *ctx)
     return ctx->d()->engine->newString(value.arg(arg->toQString()))->asReturnedValue();
 }
 
+/*!
+\qmlmethod Qt::callLater(function)
+\qmlmethod Qt::callLater(function, argument1, argument2, ...)
+Use this function to eliminate redundant calls to a function or signal.
+
+The function passed as the first argument to \l{QML:Qt::callLater()}{Qt.callLater()}
+will be called later, once the QML engine returns to the event loop.
+
+When this function is called multiple times in quick succession with the
+same function as its first argument, that function will be called only once.
+
+For example:
+\snippet doc/src/snippets/qml/qtLater.qml 0
+
+Any additional arguments passed to \l{QML:Qt::callLater()}{Qt.callLater()} will
+be passed on to the function invoked. Note that if redundant calls
+are eliminated, then only the last set of arguments will be passed to the
+function.
+*/
+ReturnedValue QtObject::method_callLater(CallContext *ctx)
+{
+    QV8Engine *v8engine = ctx->engine()->v8Engine;
+    return v8engine->delayedCallQueue()->addUniquelyAndExecuteLater(ctx);
+}
 
 QT_END_NAMESPACE
 
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
index dc806c6031..5404ab3616 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
@@ -135,6 +135,8 @@ struct QtObject : Object
 #endif
     static ReturnedValue method_get_styleHints(CallContext *ctx);
 
+    static ReturnedValue method_callLater(CallContext *ctx);
+
 private:
     void addAll();
     ReturnedValue findAndAdd(const QString *name, bool &foundProperty) const;
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 46fd4fbbeb..e08ff3b979 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -150,6 +150,7 @@ QV8Engine::QV8Engine(QJSEngine* qq)
 
     m_v4Engine = new QV4::ExecutionEngine;
     m_v4Engine->v8Engine = this;
+    m_delayedCallQueue.init(m_v4Engine);
 
     QV4::QObjectWrapper::initializeBindings(m_v4Engine);
 }
@@ -159,18 +160,22 @@ QV8Engine::~QV8Engine()
     qDeleteAll(m_extensionData);
     m_extensionData.clear();
 
+#if !defined(QT_NO_XMLSTREAMREADER) && defined(QT_NO_NETWORK)
     qt_rem_qmlxmlhttprequest(m_v4Engine, m_xmlHttpRequestData);
     m_xmlHttpRequestData = 0;
+#endif
     delete m_listModelData;
     m_listModelData = 0;
 
     delete m_v4Engine;
 }
 
+#ifndef QT_NO_NETWORK
 QNetworkAccessManager *QV8Engine::networkAccessManager()
 {
     return QQmlEnginePrivate::get(m_engine)->getNetworkAccessManager();
 }
+#endif
 
 const QSet<QString> &QV8Engine::illegalNames() const
 {
@@ -189,8 +194,10 @@ void QV8Engine::initializeGlobal()
     QQmlDateExtension::registerExtension(m_v4Engine);
     QQmlNumberExtension::registerExtension(m_v4Engine);
 
+#if !defined(QT_NO_XMLSTREAMREADER) && !defined(QT_NO_NETWORK)
     qt_add_domexceptions(m_v4Engine);
     m_xmlHttpRequestData = qt_add_qmlxmlhttprequest(m_v4Engine);
+#endif
 
     qt_add_sqlexceptions(m_v4Engine);
 
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index 2cfa996409..390831609b 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -67,6 +67,7 @@
 #include <private/qv4value_p.h>
 #include <private/qv4identifier_p.h>
 #include <private/qv4context_p.h>
+#include <private/qqmldelayedcallqueue_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -76,12 +77,6 @@ namespace QV4 {
     struct QObjectMethod;
 }
 
-// Uncomment the following line to enable global handle debugging.  When enabled, all the persistent
-// handles allocated using qPersistentNew() (or registered with qPersistentRegsiter()) and disposed
-// with qPersistentDispose() are tracked.  If you try and do something illegal, like double disposing
-// a handle, qFatal() is called.
-// #define QML_GLOBAL_HANDLE_DEBUGGING
-
 #define V4THROW_ERROR(string) \
     return ctx->engine()->throwError(QString::fromUtf8(string));
 
@@ -184,6 +179,7 @@ public:
     QQmlEngine *engine() { return m_engine; }
     QJSEngine *publicEngine() { return q; }
     QV4::ReturnedValue global();
+    QQmlDelayedCallQueue *delayedCallQueue() { return &m_delayedCallQueue; }
 
     void *xmlHttpRequestData() { return m_xmlHttpRequestData; }
 
@@ -192,10 +188,12 @@ public:
 
     void freezeObject(const QV4::Value &value);
 
+#ifndef QT_NO_NETWORK
     // Return the network access manager for this engine.  By default this returns the network
     // access manager of the QQmlEngine.  It is overridden in the case of a threaded v8
     // instance (like in WorkerScript).
     virtual QNetworkAccessManager *networkAccessManager();
+#endif
 
     // Return the list of illegal id names (the names of the properties on the global object)
     const QSet<QString> &illegalNames() const;
@@ -217,6 +215,7 @@ public:
 protected:
     QJSEngine* q;
     QQmlEngine *m_engine;
+    QQmlDelayedCallQueue m_delayedCallQueue;
 
     QV4::ExecutionEngine *m_v4Engine;
 
diff --git a/src/qml/qml/v8/v8.pri b/src/qml/qml/v8/v8.pri
index 3d6a012481..4592022939 100644
--- a/src/qml/qml/v8/v8.pri
+++ b/src/qml/qml/v8/v8.pri
@@ -9,4 +9,3 @@ SOURCES += \
     $$PWD/qv4domerrors.cpp \
     $$PWD/qv4sqlerrors.cpp \
     $$PWD/qqmlbuiltinfunctions.cpp
-