8 files changed, 21 insertions, 19 deletions
diff --git a/src/render/backend/apishadermanager_p.h b/src/render/backend/apishadermanager_p.h
index 17a3a9865..d8820d12f 100644
--- a/src/render/backend/apishadermanager_p.h
+++ b/src/render/backend/apishadermanager_p.h
@@ -200,15 +200,15 @@ private:
 
     bool isSameShader(const APIShader *apiShader, const Shader *shaderNode)
     {
-        const QVector<QByteArray> nodeShaderCode = shaderNode->shaderCode();
-        const QVector<QByteArray> apiShaderCode = apiShader->shaderCode();
+        const std::vector<QByteArray> &nodeShaderCode = shaderNode->shaderCode();
+        const std::vector<QByteArray> &apiShaderCode = apiShader->shaderCode();
 
-        const int s = nodeShaderCode.size();
+        const size_t s = nodeShaderCode.size();
 
         Q_ASSERT(s == apiShaderCode.size());
 
-        for (int i = 0; i < s; ++i)
-            if (nodeShaderCode.at(i) != apiShaderCode.at(i))
+        for (size_t i = 0; i < s; ++i)
+            if (nodeShaderCode[i] != apiShaderCode[i])
                 return false;
 
         return true;
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index 28600581d..407f788a0 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -79,7 +79,7 @@ public:
     void updateDataFromGPUToCPU(QByteArray data);
     inline Qt3DCore::QBuffer::UsageType usage() const { return m_usage; }
     inline QByteArray data() const { return m_data; }
-    inline QVector<Qt3DCore::QBufferUpdate> &pendingBufferUpdates() { return m_bufferUpdates; }
+    inline std::vector<Qt3DCore::QBufferUpdate> &pendingBufferUpdates() { return m_bufferUpdates; }
     inline bool isDirty() const { return m_bufferDirty; }
     inline Qt3DCore::QBuffer::AccessType access() const { return m_access; }
     void unsetDirty();
@@ -89,7 +89,7 @@ private:
 
     Qt3DCore::QBuffer::UsageType m_usage;
     QByteArray m_data;
-    QVector<Qt3DCore::QBufferUpdate> m_bufferUpdates;
+    std::vector<Qt3DCore::QBufferUpdate> m_bufferUpdates;
     bool m_bufferDirty;
     Qt3DCore::QBuffer::AccessType m_access;
     BufferManager *m_manager;
diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp
index ebdb4c64b..0e777e9aa 100644
--- a/src/render/materialsystem/shader.cpp
+++ b/src/render/materialsystem/shader.cpp
@@ -120,7 +120,7 @@ void Shader::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
     for (int i = QShaderProgram::Vertex; i <= QShaderProgram::Compute; ++i) {
         const QShaderProgram::ShaderType shaderType = static_cast<QShaderProgram::ShaderType>(i);
         const QByteArray code = node->shaderCode(shaderType);
-        if (code != m_shaderCode.value(shaderType))
+        if (code != m_shaderCode[shaderType])
             setShaderCode(shaderType, code);
     }
     setFormat(node->format());
@@ -148,7 +148,7 @@ void Shader::setFormat(QShaderProgram::Format format)
     markDirty(AbstractRenderer::ShadersDirty);
 }
 
-QVector<QByteArray> Shader::shaderCode() const
+const std::vector<QByteArray> &Shader::shaderCode() const
 {
     return m_shaderCode;
 }
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index a393c1809..924d60db4 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -99,7 +99,7 @@ public:
 
     void cleanup();
 
-    QVector<QByteArray> shaderCode() const;
+    const std::vector<QByteArray> &shaderCode() const;
     void setShaderCode(QShaderProgram::ShaderType type, const QByteArray &code);
 
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
@@ -123,7 +123,7 @@ public:
     void requestCacheRebuild();
 
 private:
-    QVector<QByteArray> m_shaderCode;
+    std::vector<QByteArray> m_shaderCode;
 
     QString m_log;
     bool m_requiresFrontendSync;
diff --git a/src/render/materialsystem/techniquemanager.cpp b/src/render/materialsystem/techniquemanager.cpp
index a59810ea1..2ecb5c3b3 100644
--- a/src/render/materialsystem/techniquemanager.cpp
+++ b/src/render/materialsystem/techniquemanager.cpp
@@ -52,12 +52,14 @@ TechniqueManager::TechniqueManager()
 // AspectThread
 void TechniqueManager::addDirtyTechnique(Qt3DCore::QNodeId techniqueId)
 {
-    if (!m_dirtyTechniques.contains(techniqueId))
+    if (std::find(m_dirtyTechniques.begin(),
+                  m_dirtyTechniques.end(),
+                  techniqueId) == m_dirtyTechniques.end())
         m_dirtyTechniques.push_back(techniqueId);
 }
 
 // AspectThread
-QVector<Qt3DCore::QNodeId> TechniqueManager::takeDirtyTechniques()
+std::vector<Qt3DCore::QNodeId> TechniqueManager::takeDirtyTechniques()
 {
     return std::move(m_dirtyTechniques);
 }
diff --git a/src/render/materialsystem/techniquemanager_p.h b/src/render/materialsystem/techniquemanager_p.h
index 205dbc191..84c82d22d 100644
--- a/src/render/materialsystem/techniquemanager_p.h
+++ b/src/render/materialsystem/techniquemanager_p.h
@@ -69,10 +69,10 @@ public:
     TechniqueManager();
 
     void addDirtyTechnique(Qt3DCore::QNodeId techniqueId);
-    QVector<Qt3DCore::QNodeId> takeDirtyTechniques();
+    std::vector<Qt3DCore::QNodeId> takeDirtyTechniques();
 
 private:
-    QVector<Qt3DCore::QNodeId> m_dirtyTechniques;
+    std::vector<Qt3DCore::QNodeId> m_dirtyTechniques;
 };
 
 } // Render
diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp
index 5b9c4e8b5..1d0dce4c8 100644
--- a/src/render/renderstates/renderstateset.cpp
+++ b/src/render/renderstates/renderstateset.cpp
@@ -105,7 +105,7 @@ StateMaskSet RenderStateSet::stateMask() const
 void RenderStateSet::merge(const RenderStateSet *other)
 {
     m_stateMask |= other->stateMask();
-    const QVector<StateVariant> otherStates = other->states();
+    const std::vector<StateVariant> &otherStates = other->states();
 
     // We only add states which are new (different type)
     for (const StateVariant &otherState : otherStates) {
diff --git a/src/render/renderstates/renderstateset_p.h b/src/render/renderstates/renderstateset_p.h
index 667c2614d..8442ea357 100644
--- a/src/render/renderstates/renderstateset_p.h
+++ b/src/render/renderstates/renderstateset_p.h
@@ -91,8 +91,8 @@ public:
     StateMaskSet stateMask() const;
     void merge(const RenderStateSet *other);
 
-    const QVector<StateVariant>& states() const noexcept { return m_states; }
-    QVector<StateVariant>& states() noexcept { return m_states; }
+    const std::vector<StateVariant>& states() const noexcept { return m_states; }
+    std::vector<StateVariant>& states() noexcept { return m_states; }
 
     bool canAddStateOfType(StateMask type) const;
 
@@ -109,7 +109,7 @@ private:
 
 private:
     StateMaskSet m_stateMask;
-    QVector<StateVariant> m_states;
+    std::vector<StateVariant> m_states;
 };
 
 template<>