From ee6b0094a1b8f750b0be19fd6372ff85261750b0 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Mon, 6 Jul 2020 08:43:10 +0200 Subject: GLTexture: change internals to use std::vector Change-Id: If680702aed4544395866a7b376db920561bf16cc Reviewed-by: Mike Krus --- src/render/texture/texture_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/render') diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h index 379b4439c..a19ad8581 100644 --- a/src/render/texture/texture_p.h +++ b/src/render/texture/texture_p.h @@ -159,7 +159,7 @@ public: void cleanup(); void addTextureDataUpdate(const QTextureDataUpdate &update); - QVector takePendingTextureDataUpdates() { return std::move(m_pendingTextureDataUpdates); } + std::vector &&takePendingTextureDataUpdates() { return std::move(m_pendingTextureDataUpdates); } void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override; @@ -181,7 +181,7 @@ private: Qt3DCore::QNodeIdVector m_textureImageIds; QMutex m_flagsMutex; - QVector m_pendingTextureDataUpdates; + std::vector m_pendingTextureDataUpdates; }; class Q_AUTOTEST_EXPORT TextureFunctor : public Qt3DCore::QBackendNodeMapper -- cgit v1.2.3