diff options
Diffstat (limited to 'src/qml/qml/v8/qv8qobjectwrapper.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8qobjectwrapper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp index fdf07389c2..8c884c492d 100644 --- a/src/qml/qml/v8/qv8qobjectwrapper.cpp +++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp @@ -1964,8 +1964,7 @@ QV4::Value QObjectMethod::method_destroy(QV4::ExecutionContext *ctx, Value *args { if (!m_object) return QV4::Value::undefinedValue(); - QQmlData *ddata = QQmlData::get(m_object, false); - if (!ddata || ddata->indestructible || ddata->rootObjectInCreation) + if (QQmlData::keepAliveDuringGarbageCollection(m_object)) ctx->throwError(QStringLiteral("Invalid attempt to destroy() an indestructible object")); int delay = 0; |