diff options
| -rw-r--r-- | src/core/nodes/qnode_p.h | 2 | ||||
| -rw-r--r-- | src/render/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h index 208474802..61aa81c81 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(), - [this, node] (const QPair<QNode *, QMetaObject::Connection> &nodeConnectionPair) { + [node] (const QPair<QNode *, QMetaObject::Connection> &nodeConnectionPair) { if (nodeConnectionPair.first == node) { QObject::disconnect(nodeConnectionPair.second); return true; diff --git a/src/render/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp b/src/render/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp index 658458568..c6bc20423 100644 --- a/src/render/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp +++ b/src/render/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp @@ -55,7 +55,7 @@ RenderViewCommandBuilderJob::RenderViewCommandBuilderJob() : Qt3DCore::QAspectJob() , m_renderView(nullptr) { - SET_JOB_RUN_STAT_TYPE(this, JobTypes::RenderViewCommandBuilder, renderViewInstanceCounter++); + SET_JOB_RUN_STAT_TYPE(this, JobTypes::RenderViewCommandBuilder, renderViewInstanceCounter++) } void RenderViewCommandBuilderJob::run() @@ -63,11 +63,9 @@ void RenderViewCommandBuilderJob::run() if (!m_renderView->noDraw()) { const bool isDraw = !m_renderView->isCompute(); if (isDraw) - m_commandData = std::move(m_renderView->buildDrawRenderCommands( - m_entities)); + m_commandData = m_renderView->buildDrawRenderCommands(m_entities); else - m_commandData = std::move(m_renderView->buildComputeRenderCommands( - m_entities)); + m_commandData = m_renderView->buildComputeRenderCommands(m_entities); } } |