Remove QQmlEngine::collectGarbage() overload

QQmlEngine inherits from QJSEngine, which has a collectGarbage()
function that does exactly the same.

Also remove doc references to non-existing function
reportAdditionalMemoryCost().

Change-Id: Iff12d2cf940f3afcd88967eb9a841c2f6082ca37
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index ebf3a7c..352030d 100644 (file)
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -947,14 +947,6 @@ void QQmlEngine::setOutputWarningsToStandardError(bool enabled)
 }
 
 /*!
-  Attempt to free unused memory.
-*/
-void QQmlEngine::collectGarbage()
-{
-    QV8Engine::gc();
-}
-
-/*!
   Returns the QQmlContext for the \a object, or 0 if no
   context has been set.
 

diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h
index f2b7f29..2bca3c1 100644 (file)
--- a/src/qml/qml/qqmlengine.h
+++ b/src/qml/qml/qqmlengine.h
@@ -138,8 +138,6 @@ public:
     bool outputWarningsToStandardError() const;
     void setOutputWarningsToStandardError(bool);
 
-    void collectGarbage();
-    
     static QQmlContext *contextForObject(const QObject *);
     static void setContextForObject(QObject *, QQmlContext *);
 

diff --git a/src/qml/qml/v8/qjsengine.cpp b/src/qml/qml/v8/qjsengine.cpp
index d2c8067..af47877 100644 (file)
--- a/src/qml/qml/v8/qjsengine.cpp
+++ b/src/qml/qml/v8/qjsengine.cpp
@@ -206,8 +206,6 @@ QJSEngine::~QJSEngine()
     when the QJSEngine decides that it's wise to do so (i.e. when a certain number of new objects
     have been created). However, you can call this function to explicitly request that garbage
     collection should be performed as soon as possible.
-
-    \sa reportAdditionalMemoryCost()
 */
 void QJSEngine::collectGarbage()
 {
@@ -296,7 +294,7 @@ QJSValue QJSEngine::newArray(uint length)
   wrapper object (either by script code or C++) will result in a
   script exception.
 
-  \sa QJSValue::toQObject(), reportAdditionalMemoryCost()
+  \sa QJSValue::toQObject()
 */
 QJSValue QJSEngine::newQObject(QObject *object)
 {