diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-16 15:18:48 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-17 21:16:27 +0200 |
| commit | 0e3f38f79c62fcb6a93b7371c9b2c2cba106772c (patch) | |
| tree | 77abf25f8076e8531391e5058dca5d421911a877 /examples/deferred-renderer-cpp/sceneeffect.cpp | |
| parent | dbe217b871e11820279d62964d8df2f16d57778c (diff) | |
Renamed QCriterion to QAnnotation
Change-Id: I4b40120807a60873b38687ba8ce0b6c2dfd77127
Task-number: QTBUG-41534
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/deferred-renderer-cpp/sceneeffect.cpp')
| -rw-r--r-- | examples/deferred-renderer-cpp/sceneeffect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/deferred-renderer-cpp/sceneeffect.cpp b/examples/deferred-renderer-cpp/sceneeffect.cpp index 1b2682ec1..f67c070e7 100644 --- a/examples/deferred-renderer-cpp/sceneeffect.cpp +++ b/examples/deferred-renderer-cpp/sceneeffect.cpp @@ -50,7 +50,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent) , m_gl2Technique(new Qt3D::QTechnique()) , m_gl2Pass(new Qt3D::QRenderPass()) , m_gl3Pass(new Qt3D::QRenderPass()) - , m_passCriterion(new Qt3D::QCriterion(this)) + , m_passCriterion(new Qt3D::QAnnotation(this)) { m_gl3Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::None); @@ -87,7 +87,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent) addTechnique(m_gl2Technique); } -QList<Qt3D::QCriterion *> SceneEffect::passCriteria() const +QList<Qt3D::QAnnotation *> SceneEffect::passCriteria() const { - return QList<Qt3D::QCriterion *>() << m_passCriterion; + return QList<Qt3D::QAnnotation *>() << m_passCriterion; } |