diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-10-03 15:59:25 +0200 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2019-10-03 20:11:14 +0000 |
| commit | ea407396b6bd6531e2214b2e1595e4a61037a11c (patch) | |
| tree | 7381561705d4826093d60c769ad2b17408994cad /src/render/materialsystem | |
| parent | df75e9c6d5cafc622adf36c026ece5b163e5e94d (diff) | |
Undo deprecation on graphicsApiFilter() non const getter
While the non-const function should not have been added originally,
deprecating it causes loads of warnings when compiling Qt 3D itself.
Change-Id: Ibb2bc37975c649e35e252c88d8c748c234160e2e
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render/materialsystem')
| -rw-r--r-- | src/render/materialsystem/qtechnique.cpp | 1 | ||||
| -rw-r--r-- | src/render/materialsystem/qtechnique.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index 1f7094632..2b96aa285 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -373,7 +373,6 @@ QVector<QParameter *> QTechnique::parameters() const return d->m_parameters; } -// TODO Qt 6 -> Remove QGraphicsApiFilter *QTechnique::graphicsApiFilter() { Q_D(QTechnique); diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index f0c857c2b..b9887b6a2 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -76,7 +76,7 @@ public: void removeRenderPass(QRenderPass *pass); QVector<QRenderPass *> renderPasses() const; - Q_DECL_DEPRECATED QGraphicsApiFilter *graphicsApiFilter(); + QGraphicsApiFilter *graphicsApiFilter(); const QGraphicsApiFilter *graphicsApiFilter() const; protected: |