summaryrefslogtreecommitdiffstats
path: root/tests/auto/extras
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-01-30 08:31:42 +0000
committerMike Krus <mike.krus@kdab.com>2020-01-31 06:18:53 +0000
commit3e2b688817d615c1458e1144ad0f0f35555475e8 (patch)
tree9e9543409580547e94737a586d3bd7b0c8dd138e /tests/auto/extras
parentc5211b7026ebf26bc82889437329ae2cc11e9725 (diff)
Deprecate functor APIs
Deprecate functor based APIs for buffer generators, geometry factories, texture data generators and mesh loaders While these are useful for some of Qt3D's internal mechanisms, they complicate some of the backend operations. Will delete some or make them private in Qt6. Change-Id: I64eaa338e0306647867d2084819ef8591e2c91c0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/extras')
-rw-r--r--tests/auto/extras/common/geometrytesthelper.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/extras/common/geometrytesthelper.h b/tests/auto/extras/common/geometrytesthelper.h
index 48e674cd9..5b04a078b 100644
--- a/tests/auto/extras/common/geometrytesthelper.h
+++ b/tests/auto/extras/common/geometrytesthelper.h
@@ -42,9 +42,12 @@ inline void generateGeometry(Qt3DRender::QGeometry &geometry)
// Get all unique data generators from the buffers referenced by the attributes
QHash<Qt3DRender::QBufferDataGeneratorPtr, Qt3DRender::QBuffer *> dataGenerators;
for (const auto attribute : attributes) {
+ QT_WARNING_PUSH
+ QT_WARNING_DISABLE_DEPRECATED
const auto dataGenerator = attribute->buffer()->dataGenerator();
if (!dataGenerators.contains(dataGenerator))
dataGenerators.insert(dataGenerator, attribute->buffer());
+ QT_WARNING_POP
}
// Generate data for each buffer