diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-14 10:55:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-14 10:55:29 +0100 |
| commit | aef625746025bbb5c5af1a3f8159c77413ceeaf5 (patch) | |
| tree | 9cdd3325ac7b39d430d20f6fff534fbea1f5e888 /src/core | |
| parent | 50db67eb310fba162f73ac6fdf28a8457ce50b21 (diff) | |
| parent | b33b615f4a4ac4d61bbce320783d5cca6edd91d1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
.qmake.conf
src/core/nodes/qnode_p.h
src/render/renderers/opengl/renderer/renderview.cpp
Change-Id: I24483612f9f395e9ffc0bd6163bbfa092b13b7cb
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nodes/qnode_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h index 61aa81c81..208474802 100644 --- a/src/core/nodes/qnode_p.h +++ b/src/core/nodes/qnode_p.h @@ -161,7 +161,7 @@ public: { m_destructionConnections.erase(std::remove_if(m_destructionConnections.begin(), m_destructionConnections.end(), - [node] (const QPair<QNode *, QMetaObject::Connection> &nodeConnectionPair) { + [this, node] (const QPair<QNode *, QMetaObject::Connection> &nodeConnectionPair) { if (nodeConnectionPair.first == node) { QObject::disconnect(nodeConnectionPair.second); return true; |