summaryrefslogtreecommitdiffstats
path: root/tests/auto/render
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/render')
-rw-r--r--tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp2
-rw-r--r--tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp6
-rw-r--r--tests/auto/render/uniform/tst_uniform.cpp8
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp b/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp
index 9f452cd24..aefbeffbe 100644
--- a/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp
+++ b/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp
@@ -168,7 +168,7 @@ void tst_QGraphicsUtils::fillScalarWithOffsets()
intUniform.m_matrixStride = 0;
intUniform.m_offset = 48;
- QList<GLfloat> data(16);
+ QVector<GLfloat> data(16);
void *innerData = data.data();
Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData,
diff --git a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp
index b06025b50..ca176f7c2 100644
--- a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp
+++ b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp
@@ -101,7 +101,7 @@ void tst_RenderQueue::checkOrder()
// GIVEN
Qt3DRender::Render::RenderQueue<Qt3DRender::Render::OpenGL::RenderView> renderQueue;
renderQueue.setTargetRenderViewCount(7);
- QList<Qt3DRender::Render::OpenGL::RenderView *> renderViews(7);
+ QVector<Qt3DRender::Render::OpenGL::RenderView *> renderViews(7);
// WHEN
for (int i = 0; i < 7; ++i) {
@@ -122,7 +122,7 @@ void tst_RenderQueue::checkTimeToSubmit()
// GIVEN
Qt3DRender::Render::RenderQueue<Qt3DRender::Render::OpenGL::RenderView> renderQueue;
renderQueue.setTargetRenderViewCount(7);
- QList<Qt3DRender::Render::OpenGL::RenderView *> renderViews(7);
+ QVector<Qt3DRender::Render::OpenGL::RenderView *> renderViews(7);
// WHEN
for (int i = 0; i < 7; i++) {
@@ -222,7 +222,7 @@ void tst_RenderQueue::resetQueue()
QVERIFY(renderQueue.currentRenderViewCount() == 0);
// WHEN
- QList<Qt3DRender::Render::OpenGL::RenderView *> renderViews(5);
+ QVector<Qt3DRender::Render::OpenGL::RenderView *> renderViews(5);
for (int i = 0; i < 5; ++i) {
renderQueue.queueRenderView(renderViews.at(i), i);
}
diff --git a/tests/auto/render/uniform/tst_uniform.cpp b/tests/auto/render/uniform/tst_uniform.cpp
index 3a3ee5667..8e7a50579 100644
--- a/tests/auto/render/uniform/tst_uniform.cpp
+++ b/tests/auto/render/uniform/tst_uniform.cpp
@@ -133,7 +133,7 @@ private Q_SLOTS:
QMatrix4x4 m4;
m4.translate(1.0f, 2.0f, 3.0f);
- const QList<QMatrix4x4> matrices = { m1, m2, m3, m4 };
+ const QVector<QMatrix4x4> matrices = { m1, m2, m3, m4 };
UniformValue v(matrices);
// THEN
@@ -389,11 +389,11 @@ private Q_SLOTS:
QMatrix4x4 m4;
m4.translate(1.0f, 2.0f, 3.0f);
- const QList<QMatrix4x4> matrices1 = { m1, m2, m3, m4 };
+ const QVector<QMatrix4x4> matrices1 = { m1, m2, m3, m4 };
UniformValue v(matrices1);
// WHEN
- const QList<QMatrix4x4> matrices2 = { m4, m3, m2, m1, m4 };
+ const QVector<QMatrix4x4> matrices2 = { m4, m3, m2, m1, m4 };
v.setData(matrices2);
// THEN
@@ -405,7 +405,7 @@ private Q_SLOTS:
// GIVEN
const int positionCount = 10;
- QList<QVector3D> positions(positionCount);
+ QVector<QVector3D> positions(positionCount);
for (int i = 0; i < positionCount; ++i) {
const QVector3D p(float(i), 10.0f * i, 100.0f * i);
positions[i] = p;