From c01bc22c287e58186a285b3f8507711fd982fd05 Mon Sep 17 00:00:00 2001
From: Franck Arrecot <franck.arrecot@kdab.com>
Date: Thu, 3 Mar 2016 12:57:38 +0100
Subject: QAnnotation changes

Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
---
 src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h')

diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
index a58835d81..27d637e23 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
@@ -53,7 +53,7 @@
 
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qtechniquefilter.h>
-#include <Qt3DRender/qannotation.h>
+#include <Qt3DRender/qfilterkey.h>
 #include <Qt3DQuick/private/quick3dnode_p.h>
 #include <QQmlListProperty>
 
@@ -66,22 +66,22 @@ namespace Quick {
 class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechniqueFilter : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> matchAll READ matchList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> matchAll READ matchList)
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList)
 
 public:
     explicit Quick3DTechniqueFilter(QObject *parent = 0);
 
-    QQmlListProperty<QAnnotation> matchList();
+    QQmlListProperty<QFilterKey> matchList();
     QQmlListProperty<QParameter> parameterList();
 
     inline QTechniqueFilter *parentTechniqueFilter() const { return qobject_cast<QTechniqueFilter*>(parent()); }
 
 private:
-    static void appendRequire(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
-    static QAnnotation *requireAt(QQmlListProperty<QAnnotation> *list, int index);
-    static int requiresCount(QQmlListProperty<QAnnotation> *list);
-    static void clearRequires(QQmlListProperty<QAnnotation> *list);
+    static void appendRequire(QQmlListProperty<QFilterKey> *list, QFilterKey *criterion);
+    static QFilterKey *requireAt(QQmlListProperty<QFilterKey> *list, int index);
+    static int requiresCount(QQmlListProperty<QFilterKey> *list);
+    static void clearRequires(QQmlListProperty<QFilterKey> *list);
 
     static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param);
     static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index);
-- 
cgit v1.2.3