diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-04-06 14:57:12 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-04-14 09:48:49 +0200 |
| commit | 51847c314200a179e113ea5dc4e1d24878b8bcfa (patch) | |
| tree | ca7458d8f6f6b0c3643e4f7c542bf442c5199e1f | |
| parent | 574e74ffed00158ab0dc251c2789f4dccbf01eae (diff) | |
Deprecate QSGSimpleMaterial and QSGSimpleMaterialShader
Task-number: QTBUG-82988
Change-Id: I53695571641654b8a8aed990d9de6b9947bb1186
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| -rw-r--r-- | src/quick/scenegraph/util/qsgsimplematerial.cpp | 4 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgsimplematerial.h | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/quick/scenegraph/util/qsgsimplematerial.cpp b/src/quick/scenegraph/util/qsgsimplematerial.cpp index 1064caccc7..4bbc2b17ba 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.cpp +++ b/src/quick/scenegraph/util/qsgsimplematerial.cpp @@ -46,6 +46,8 @@ \inmodule QtQuick \ingroup qtquick-scenegraph-materials + \deprecated + \warning This utility class is only functional when running with the legacy OpenGL renderer of the Qt Quick scenegraph. Its usage is not recommended in new application code. @@ -234,6 +236,8 @@ /*! \class QSGSimpleMaterial + \deprecated + \inmodule QtQuick \ingroup qtquick-scenegraph-materials diff --git a/src/quick/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h index 79180ca8e2..78cd05f2d8 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.h +++ b/src/quick/scenegraph/util/qsgsimplematerial.h @@ -44,6 +44,8 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + template <typename State> class QSGSimpleMaterialShader : public QSGMaterialShader { @@ -77,6 +79,7 @@ public: void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; + QT_DEPRECATED_X("QSGSimpleMaterialShader is going to be removed in Qt 6.0. Use QSGMaterialShader instead.") virtual void updateState(const State *newState, const State *oldState) = 0; virtual void resolveUniforms() {} @@ -139,12 +142,14 @@ class QSGSimpleMaterial : public QSGMaterial { public: #ifndef Q_CLANG_QDOC + QT_DEPRECATED_X("QSGSimpleMaterial is going to be removed in Qt 6.0. Use QSGMaterial instead.") QSGSimpleMaterial(const State &aState, PtrShaderCreateFunc func) : m_state(aState) , m_func(func) { } + QT_DEPRECATED_X("QSGSimpleMaterial is going to be removed in Qt 6.0. Use QSGMaterial instead.") QSGSimpleMaterial(PtrShaderCreateFunc func) : m_func(func) { @@ -213,6 +218,8 @@ Q_INLINE_TEMPLATE void QSGSimpleMaterialShader<State>::updateState(const RenderS updateState(ns, old); } +#endif + QT_END_NAMESPACE |