summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/qmaterial
diff options
context:
space:
mode:
authorFranck Arrecot <franck.arrecot@kdab.com>2016-03-03 12:57:38 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-03-17 11:25:16 +0000
commitc01bc22c287e58186a285b3f8507711fd982fd05 (patch)
tree77a5b100d5a02de3cf864672590cdde5d4099301 /tests/auto/render/qmaterial
parenta8371dccd60a097678239edc510e5bb4624b52b8 (diff)
QAnnotation changes
Task-number: QTBUG-51454 Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/qmaterial')
-rw-r--r--tests/auto/render/qmaterial/tst_qmaterial.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp
index 804c22112..98902d3ea 100644
--- a/tests/auto/render/qmaterial/tst_qmaterial.cpp
+++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp
@@ -129,7 +129,7 @@ private:
compareParameters(original->parameters(), clone->parameters());
compareRenderStates(original->renderStates(), clone->renderStates());
- compareAnnotations(original->annotations(), clone->annotations());
+ compareFilterKeys(original->filterKeys(), clone->filterKeys());
compareShaderPrograms(original->shaderProgram(), clone->shaderProgram());
}
@@ -146,14 +146,14 @@ private:
}
}
- void compareAnnotations(const QList<Qt3DRender::QAnnotation *> &original, const QList<Qt3DRender::QAnnotation *> &clone)
+ void compareFilterKeys(const QList<Qt3DRender::QFilterKey *> &original, const QList<Qt3DRender::QFilterKey *> &clone)
{
const int annotationsCount = original.size();
QCOMPARE(annotationsCount, clone.size());
for (int i = 0; i < annotationsCount; ++i) {
- const Qt3DRender::QAnnotation *origAnnotation = original.at(i);
- const Qt3DRender::QAnnotation *cloneAnnotation = clone.at(i);
+ const Qt3DRender::QFilterKey *origAnnotation = original.at(i);
+ const Qt3DRender::QFilterKey *cloneAnnotation = clone.at(i);
QCOMPARE(origAnnotation->id(), cloneAnnotation->id());
QCOMPARE(origAnnotation->name(), cloneAnnotation->name());
QCOMPARE(origAnnotation->value(), cloneAnnotation->value());