diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-05-22 15:13:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-24 09:41:15 +0200 |
| commit | afc0d1f0454858aefb342353afb4df4b27863382 (patch) | |
| tree | d61d2b6a0a725fc151556159c2aec273814a7baa /src/qml/qml | |
| parent | 09e624fa6b00855f5daa682fe8b9444e0e170d7f (diff) | |
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>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 8 | ||||
| -rw-r--r-- | src/qml/qml/qqmlengine.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/v8/qjsengine.cpp | 4 |
3 files changed, 1 insertions, 13 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index ebf3a7c3a9..352030d246 100644 --- 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 f2b7f299a0..2bca3c1403 100644 --- 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 d2c8067839..af47877c35 100644 --- 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) { |