diff options
23 files changed, 73 insertions, 8 deletions
diff --git a/src/render/frontend/qabstractfunctor.h b/src/render/frontend/qabstractfunctor.h index 45492e141..697b22613 100644 --- a/src/render/frontend/qabstractfunctor.h +++ b/src/render/frontend/qabstractfunctor.h @@ -62,7 +62,7 @@ struct FunctorType }; template<class T> -qintptr functorTypeId() +Q3D_DECL_DEPRECATED qintptr functorTypeId() { return reinterpret_cast<qintptr>(&FunctorType<T>::id); } @@ -76,7 +76,7 @@ qintptr functorTypeId() class Q_3DRENDERSHARED_EXPORT QAbstractFunctor { public: - QAbstractFunctor() = default; + Q3D_DECL_DEPRECATED QAbstractFunctor() = default; virtual ~QAbstractFunctor(); virtual qintptr id() const = 0; diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index aa6ebca66..f1ce110f0 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -107,8 +107,8 @@ public: void setData(const QByteArray &bytes); QByteArray data() const; - void setDataGenerator(const QBufferDataGeneratorPtr &functor); - QBufferDataGeneratorPtr dataGenerator() const; + Q3D_DECL_DEPRECATED void setDataGenerator(const QBufferDataGeneratorPtr &functor); + Q3D_DECL_DEPRECATED QBufferDataGeneratorPtr dataGenerator() const; Q_INVOKABLE void updateData(int offset, const QByteArray &bytes); diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 14de40d0b..3f0f9fab2 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -103,8 +103,8 @@ public: QGeometry *geometry() const; PrimitiveType primitiveType() const; - QGeometryFactoryPtr geometryFactory() const; - void setGeometryFactory(const QGeometryFactoryPtr &factory); + Q3D_DECL_DEPRECATED QGeometryFactoryPtr geometryFactory() const; + Q3D_DECL_DEPRECATED void setGeometryFactory(const QGeometryFactoryPtr &factory); public Q_SLOTS: void setInstanceCount(int instanceCount); diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h index 4a4ff4979..c80c930c5 100644 --- a/src/render/geometry/qmesh_p.h +++ b/src/render/geometry/qmesh_p.h @@ -120,7 +120,10 @@ public : QGeometry *operator()() override; bool operator ==(const QGeometryFactory &other) const override; + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED QT3D_FUNCTOR(MeshLoaderFunctor) + QT_WARNING_POP private: Qt3DCore::QNodeId m_mesh; diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp index 258ab44dc..2e7fd0f63 100644 --- a/src/render/texture/qabstracttexture.cpp +++ b/src/render/texture/qabstracttexture.cpp @@ -1182,7 +1182,7 @@ void QAbstractTexture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) } default: break; - }; + } } diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h index b3d5efb34..2512d0786 100644 --- a/src/render/texture/qabstracttexture.h +++ b/src/render/texture/qabstracttexture.h @@ -306,7 +306,7 @@ public: int depth() const; int layers() const; int samples() const; - QTextureGeneratorPtr dataGenerator() const; + Q3D_DECL_DEPRECATED QTextureGeneratorPtr dataGenerator() const; HandleType handleType() const; QVariant handle() const; 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 diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp index fa1491914..5c2ae296d 100644 --- a/tests/auto/render/buffer/tst_buffer.cpp +++ b/tests/auto/render/buffer/tst_buffer.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <qbackendnodetester.h> #include <Qt3DRender/private/buffer_p.h> diff --git a/tests/auto/render/ddstextures/tst_ddstextures.cpp b/tests/auto/render/ddstextures/tst_ddstextures.cpp index 1f33f20e2..ecdb5d234 100644 --- a/tests/auto/render/ddstextures/tst_ddstextures.cpp +++ b/tests/auto/render/ddstextures/tst_ddstextures.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DRender/qtextureimagedata.h> #include <Qt3DRender/private/qtexture_p.h> diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp index 09dbb8eb3..a13f6fa40 100644 --- a/tests/auto/render/geometry/tst_geometry.cpp +++ b/tests/auto/render/geometry/tst_geometry.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <qbackendnodetester.h> #include <Qt3DRender/private/geometry_p.h> diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp index 0f6af16db..19df24680 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <qbackendnodetester.h> #include <Qt3DRender/private/geometryrenderer_p.h> diff --git a/tests/auto/render/gltexture/tst_gltexture.cpp b/tests/auto/render/gltexture/tst_gltexture.cpp index e971078d0..7d8c679f3 100644 --- a/tests/auto/render/gltexture/tst_gltexture.cpp +++ b/tests/auto/render/gltexture/tst_gltexture.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DRender/private/gltexture_p.h> #include <Qt3DRender/qabstracttexture.h> diff --git a/tests/auto/render/ktxtextures/tst_ktxtextures.cpp b/tests/auto/render/ktxtextures/tst_ktxtextures.cpp index 57ccd3652..f57bc86b6 100644 --- a/tests/auto/render/ktxtextures/tst_ktxtextures.cpp +++ b/tests/auto/render/ktxtextures/tst_ktxtextures.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DRender/qtextureimagedata.h> #include <Qt3DRender/private/qtexture_p.h> diff --git a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp index 1142d1447..f8110085b 100644 --- a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp +++ b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QtTest> #include <Qt3DCore/qcomponent.h> #include <Qt3DRender/qgeometryfactory.h> diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp index d0e6512d5..b281eb6cb 100644 --- a/tests/auto/render/picking/tst_picking.cpp +++ b/tests/auto/render/picking/tst_picking.cpp @@ -82,8 +82,11 @@ public: Qt3DRender::QBuffer *vertexBuffer = static_cast<Qt3DRender::QBuffer *>(positionAttr->buffer()); // Load the geometry + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED const QByteArray data = (*vertexBuffer->dataGenerator())(); vertexBuffer->setData(data); + QT_WARNING_POP transform->setTranslation(position); diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp index 94c0a49cb..fd96bf1c2 100644 --- a/tests/auto/render/qbuffer/tst_qbuffer.cpp +++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> diff --git a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp index bbecdd187..8c64a005a 100644 --- a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp +++ b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DRender/qgeometryrenderer.h> diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp index 28574d3c5..8cfbc0d23 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> diff --git a/tests/auto/render/qmesh/tst_qmesh.cpp b/tests/auto/render/qmesh/tst_qmesh.cpp index 0df96dd24..d77005dfa 100644 --- a/tests/auto/render/qmesh/tst_qmesh.cpp +++ b/tests/auto/render/qmesh/tst_qmesh.cpp @@ -26,6 +26,9 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED #include <QtTest/QTest> #include <Qt3DRender/qmesh.h> diff --git a/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp b/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp index 4011eeea6..3187dbd52 100644 --- a/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp +++ b/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp @@ -26,6 +26,9 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED #include <QtTest/QTest> #include <Qt3DRender/qtexture.h> diff --git a/tests/auto/render/qtextureimage/tst_qtextureimage.cpp b/tests/auto/render/qtextureimage/tst_qtextureimage.cpp index 4996c877d..ba5c2c3d8 100644 --- a/tests/auto/render/qtextureimage/tst_qtextureimage.cpp +++ b/tests/auto/render/qtextureimage/tst_qtextureimage.cpp @@ -26,6 +26,9 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED #include <QtTest/QTest> #include <Qt3DRender/qtextureimage.h> diff --git a/tests/auto/render/qtextureloader/tst_qtextureloader.cpp b/tests/auto/render/qtextureloader/tst_qtextureloader.cpp index dd92894da..b6d949c83 100644 --- a/tests/auto/render/qtextureloader/tst_qtextureloader.cpp +++ b/tests/auto/render/qtextureloader/tst_qtextureloader.cpp @@ -26,6 +26,9 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED #include <QtTest/QTest> #include <Qt3DRender/qtexture.h> diff --git a/tests/auto/render/textures/tst_textures.cpp b/tests/auto/render/textures/tst_textures.cpp index 555bd09a3..934cc8151 100644 --- a/tests/auto/render/textures/tst_textures.cpp +++ b/tests/auto/render/textures/tst_textures.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <qbackendnodetester.h> #include <qtextureimagedatagenerator.h> |