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

2 files changed, 21 insertions, 1 deletions

diff --git a/dist/changes-5.13.2 b/dist/changes-5.13.2
new file mode 100644
index 000000000..e3bb833f0
--- /dev/null
+++ b/dist/changes-5.13.2
@@ -0,0 +1,20 @@
+Qt 5.13.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0 through 5.13.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
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;