summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/render/framegraph/qsortpolicy.cpp2
-rw-r--r--src/render/framegraph/qsortpolicy.h2
-rw-r--r--src/render/framegraph/qsortpolicy_p.h2
-rw-r--r--tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp8
4 files changed, 7 insertions, 7 deletions
diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp
index 5404005a4..c012e343a 100644
--- a/src/render/framegraph/qsortpolicy.cpp
+++ b/src/render/framegraph/qsortpolicy.cpp
@@ -108,7 +108,7 @@ void QSortPolicy::removeCriterion(QSortCriterion *criterion)
d->m_criteria.removeOne(criterion);
}
-QList<QSortCriterion *> QSortPolicy::criteria() const
+QVector<QSortCriterion *> QSortPolicy::criteria() const
{
Q_D(const QSortPolicy);
return d->m_criteria;
diff --git a/src/render/framegraph/qsortpolicy.h b/src/render/framegraph/qsortpolicy.h
index fe1dd40d0..ad51e043a 100644
--- a/src/render/framegraph/qsortpolicy.h
+++ b/src/render/framegraph/qsortpolicy.h
@@ -59,7 +59,7 @@ public:
void addCriterion(QSortCriterion *criterion);
void removeCriterion(QSortCriterion *criterion);
- QList<QSortCriterion *> criteria() const;
+ QVector<QSortCriterion *> criteria() const;
protected:
QSortPolicy(QSortPolicyPrivate &dd, Qt3DCore::QNode *parent = 0);
diff --git a/src/render/framegraph/qsortpolicy_p.h b/src/render/framegraph/qsortpolicy_p.h
index 00655e9aa..87c1b7438 100644
--- a/src/render/framegraph/qsortpolicy_p.h
+++ b/src/render/framegraph/qsortpolicy_p.h
@@ -65,7 +65,7 @@ class QSortPolicyPrivate : public QFrameGraphNodePrivate
public:
QSortPolicyPrivate();
Q_DECLARE_PUBLIC(QSortPolicy)
- QList<QSortCriterion *> m_criteria;
+ QVector<QSortCriterion *> m_criteria;
};
} // namespace Qt3DRender
diff --git a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp
index f91eb325f..0ac350ed4 100644
--- a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp
+++ b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp
@@ -59,17 +59,17 @@ private Q_SLOTS:
void checkCloning_data()
{
QTest::addColumn<Qt3DRender::QSortPolicy *>("sortPolicy");
- QTest::addColumn<QList<Qt3DRender::QSortCriterion *> >("criteria");
+ QTest::addColumn<QVector<Qt3DRender::QSortCriterion *> >("criteria");
Qt3DRender::QSortPolicy *defaultConstructed = new Qt3DRender::QSortPolicy();
- QTest::newRow("defaultConstructed") << defaultConstructed << QList<Qt3DRender::QSortCriterion *>();
+ QTest::newRow("defaultConstructed") << defaultConstructed << QVector<Qt3DRender::QSortCriterion *>();
Qt3DRender::QSortPolicy *sortPolicyWithCriteria = new Qt3DRender::QSortPolicy();
Qt3DRender::QSortCriterion *criterion1 = new Qt3DRender::QSortCriterion();
Qt3DRender::QSortCriterion *criterion2 = new Qt3DRender::QSortCriterion();
criterion1->setSort(Qt3DRender::QSortCriterion::BackToFront);
criterion2->setSort(Qt3DRender::QSortCriterion::Material);
- QList<Qt3DRender::QSortCriterion *> criteria = QList<Qt3DRender::QSortCriterion *>() << criterion1 << criterion2;
+ QVector<Qt3DRender::QSortCriterion *> criteria = QVector<Qt3DRender::QSortCriterion *>() << criterion1 << criterion2;
sortPolicyWithCriteria->addCriterion(criterion1);
sortPolicyWithCriteria->addCriterion(criterion2);
QTest::newRow("sortPolicyWithCriteria") << sortPolicyWithCriteria << criteria;
@@ -79,7 +79,7 @@ private Q_SLOTS:
{
// GIVEN
QFETCH(Qt3DRender::QSortPolicy*, sortPolicy);
- QFETCH(QList<Qt3DRender::QSortCriterion *>, criteria);
+ QFETCH(QVector<Qt3DRender::QSortCriterion *>, criteria);
// THEN
QCOMPARE(sortPolicy->criteria(), criteria);