summaryrefslogtreecommitdiffstats
path: root/src/render/renderstates/renderstateset.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2020-06-29 16:46:59 +0200
committerPaul Lemire <paul.lemire@kdab.com>2020-07-03 14:05:35 +0200
commit914752257634dede18cc5079f2a506b699744058 (patch)
tree00ea67c3d0fc11b9688472061b7d870f9860534e /src/render/renderstates/renderstateset.cpp
parent7beecb9913b25c4e7629cffad3389faea5608762 (diff)
GraphicsHelpers/GLShader: switch to std::vector
Change-Id: I8be6695e0c52dfbe353cd381d94548aba1c7da82 Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render/renderstates/renderstateset.cpp')
-rw-r--r--src/render/renderstates/renderstateset.cpp2
1 files changed, 1 insertions, 1 deletions
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) {