diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-03 12:57:38 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-03-17 11:25:16 +0000 |
| commit | c01bc22c287e58186a285b3f8507711fd982fd05 (patch) | |
| tree | 77a5b100d5a02de3cf864672590cdde5d4099301 /examples/qt3d/deferred-renderer-cpp/finaleffect.h | |
| parent | a8371dccd60a097678239edc510e5bb4624b52b8 (diff) | |
QAnnotation changes
Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/deferred-renderer-cpp/finaleffect.h')
| -rw-r--r-- | examples/qt3d/deferred-renderer-cpp/finaleffect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.h b/examples/qt3d/deferred-renderer-cpp/finaleffect.h index 95f2917cc..69a1b126c 100644 --- a/examples/qt3d/deferred-renderer-cpp/finaleffect.h +++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.h @@ -59,7 +59,7 @@ class FinalEffect : public Qt3DRender::QEffect public: explicit FinalEffect(Qt3DCore::QNode *parent = 0); - QList<Qt3DRender::QAnnotation *> passCriteria() const; + QList<Qt3DRender::QFilterKey *> passCriteria() const; inline Qt3DRender::QTechnique *gl3Technique() const { return m_gl3Technique; } inline Qt3DRender::QTechnique *gl2Technique() const { return m_gl2Technique; } @@ -68,7 +68,7 @@ private : Qt3DRender::QTechnique *m_gl2Technique; Qt3DRender::QRenderPass *m_gl2Pass; Qt3DRender::QRenderPass *m_gl3Pass; - Qt3DRender::QAnnotation *m_passCriterion; + Qt3DRender::QFilterKey *m_passCriterion; }; #endif // FINALEFFECT_H |