diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:00:47 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:00:54 +0200 |
| commit | c5f12acd27dee5fdec38b78a02a95cf7debfe9a5 (patch) | |
| tree | 0dbb89ecc77e9401eb3f2200dcbc9f3a6ea9dd68 /src/render/materialsystem/qtechnique.h | |
| parent | 4106737900476f9c98325252ec9fedcad602af92 (diff) | |
| parent | 25ecd0881ded8e4f265a4eb01ab775eafcee65d8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/render/materialsystem/qtechnique.h')
| -rw-r--r-- | src/render/materialsystem/qtechnique.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index 7711cd67f..f0c857c2b 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -76,7 +76,8 @@ public: void removeRenderPass(QRenderPass *pass); QVector<QRenderPass *> renderPasses() const; - QGraphicsApiFilter *graphicsApiFilter(); + Q_DECL_DEPRECATED QGraphicsApiFilter *graphicsApiFilter(); + const QGraphicsApiFilter *graphicsApiFilter() const; protected: explicit QTechnique(QTechniquePrivate &dd, Qt3DCore::QNode *parent = nullptr); |