diff options
| author | Tarja Sundqvist <[email protected]> | 2024-11-20 15:56:37 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2024-11-20 15:56:37 +0200 |
| commit | de625ea60fa8eb030c3348710a96b37f2281ae0f (patch) | |
| tree | c50b9fbac603d9efad0374a18c906ba14ced9e2b /src/qml/jsruntime | |
| parent | abe4729ea8db32124c36dc33fc32eb629df03043 (diff) | |
| parent | 73eeb35f09fd1ea846bb0f5ce507316f587fda9f (diff) | |
Merge tag 'v5.15.17-lts' into tqtc/lts-5.15-opensource5.15
Qt 5.15.17-lts release
Change-Id: I85da10a6f1030e50730c7aaee4c71ae861f1ecc4
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 94613598af..e86482562b 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1153,7 +1153,7 @@ void QObjectWrapper::destroyObject(bool lastCall) if (!h->object()->parent() && !ddata->indestructible) { if (ddata && ddata->ownContext) { Q_ASSERT(ddata->ownContext == ddata->context); - ddata->ownContext->emitDestruction(); + ddata->ownContext->deepClearContextObject(h->object()); ddata->ownContext = nullptr; ddata->context = nullptr; } |