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 /src/quick3d/quick3drenderer/items/quick3drenderpass.h | |
| 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 'src/quick3d/quick3drenderer/items/quick3drenderpass.h')
| -rw-r--r-- | src/quick3d/quick3drenderer/items/quick3drenderpass.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drenderer/items/quick3drenderpass.h index 5e30a4aa0..e84efa4ab 100644 --- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h +++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.h @@ -58,22 +58,22 @@ namespace Quick { class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPass : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::QCriterion> criteria READ criteriaList) + Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> criteria READ criteriaList) Q_PROPERTY(QQmlListProperty<Qt3D::QParameterMapper> bindings READ bindingList) Q_PROPERTY(QQmlListProperty<Qt3D::QRenderState> renderStates READ renderStateList) public: explicit Quick3DRenderPass(QObject *parent = 0); - QQmlListProperty<Qt3D::QCriterion> criteriaList(); + QQmlListProperty<Qt3D::QAnnotation> criteriaList(); QQmlListProperty<Qt3D::QParameterMapper> bindingList(); QQmlListProperty<Qt3D::QRenderState> renderStateList(); inline QRenderPass *parentRenderPass() const { return qobject_cast<QRenderPass *>(parent()); } private: - static void appendCriteria(QQmlListProperty<Qt3D::QCriterion> *list, QCriterion *criterion); - static QCriterion *criterionAt(QQmlListProperty<Qt3D::QCriterion> *list, int index); - static int criteriaCount(QQmlListProperty<Qt3D::QCriterion> *list); - static void clearCriteria(QQmlListProperty<Qt3D::QCriterion> *list); + static void appendCriteria(QQmlListProperty<Qt3D::QAnnotation> *list, QAnnotation *criterion); + static QAnnotation *criterionAt(QQmlListProperty<Qt3D::QAnnotation> *list, int index); + static int criteriaCount(QQmlListProperty<Qt3D::QAnnotation> *list); + static void clearCriteria(QQmlListProperty<Qt3D::QAnnotation> *list); static void appendBinding(QQmlListProperty<Qt3D::QParameterMapper> *list, QParameterMapper *binding); static QParameterMapper *bindingAt(QQmlListProperty<Qt3D::QParameterMapper> *list, int index); |