From b47ab75d17db2be57c941b4b72ec51c926a665d9 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Mon, 10 Feb 2020 15:05:47 +0000 Subject: Hide deprecated functor API Now private for QTextureGenerator and QGeometryFactory updates. QTextureImageDataGenerator remains for now as it was not previously deprecated and, mainly, it's the only API to get data into an image. Consequently, QAbstractFunctor has been un-deprecated. Change-Id: Ie6691bc402ad603d63abcf1ec9fc3513091f5740 Reviewed-by: Paul Lemire --- src/render/geometry/qgeometryrenderer.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/render/geometry/qgeometryrenderer.h') diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 5466f7800..5a98329f6 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -49,9 +49,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { class QGeometryRendererPrivate; -class QGeometryFactory; - -typedef QSharedPointer QGeometryFactoryPtr; class Q_3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent { @@ -103,9 +100,6 @@ public: QGeometry *geometry() const; PrimitiveType primitiveType() const; - Q3D_DECL_DEPRECATED QGeometryFactoryPtr geometryFactory() const; - Q3D_DECL_DEPRECATED void setGeometryFactory(const QGeometryFactoryPtr &factory); - public Q_SLOTS: void setInstanceCount(int instanceCount); void setVertexCount(int vertexCount); -- cgit v1.2.3