diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-11-07 09:28:54 +0200 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-11-07 09:28:54 +0200 |
commit | b77712dd95adb6644e9af3bf98a2a6ebc5a52ec4 (patch) | |
tree | 322294455987600356d762bf0fe0219e6da93e5c /src/core/nodes/qnode.cpp | |
parent | 36dc37fa100ad57c6709248b04d48787f482dfb4 (diff) | |
parent | 64b767368d1a03f3e4923450cec90ebf4edac050 (diff) |
Merge 5.12 into 5.12.6v5.12.6
Change-Id: I0c9bbaeaeeba1a18447c48faf189ac19ab034c1b
Diffstat (limited to 'src/core/nodes/qnode.cpp')
-rw-r--r-- | src/core/nodes/qnode.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp index 900c3f8ce..c418e03d5 100644 --- a/src/core/nodes/qnode.cpp +++ b/src/core/nodes/qnode.cpp @@ -795,10 +795,9 @@ QNode::~QNode() { Q_D(QNode); // Disconnect each connection that was stored - for (auto it = d->m_destructionConnections.begin(), end = d->m_destructionConnections.end(); it != end; ++it) - QObject::disconnect(it.value()); + for (const auto &nodeConnectionPair : qAsConst(d->m_destructionConnections)) + QObject::disconnect(nodeConnectionPair.second); d->m_destructionConnections.clear(); - Q_EMIT nodeDestroyed(); // Notify the backend that the parent lost this node as a child and |