5 files changed, 21 insertions, 21 deletions

diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index 73baa23c8..bbc91d605 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
@@ -74,7 +74,7 @@ void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QFilterKey> *list,
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter) {
         annotation->setParent(filter->parentRenderPassFilter());
-        filter->parentRenderPassFilter()->addInclude(annotation);
+        filter->parentRenderPassFilter()->addMatch(annotation);
     }
 }
 
@@ -82,7 +82,7 @@ QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QFilterKey> *lis
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter)
-        return filter->parentRenderPassFilter()->includes().at(index);
+        return filter->parentRenderPassFilter()->matchAny().at(index);
     return 0;
 }
 
@@ -90,7 +90,7 @@ int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter)
-        return filter->parentRenderPassFilter()->includes().count();
+        return filter->parentRenderPassFilter()->matchAny().count();
     return 0;
 }
 
@@ -98,8 +98,8 @@ void Quick3DRenderPassFilter::clearIncludes(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter) {
-        Q_FOREACH (QFilterKey *criterion, filter->parentRenderPassFilter()->includes())
-            filter->parentRenderPassFilter()->removeInclude(criterion);
+        Q_FOREACH (QFilterKey *criterion, filter->parentRenderPassFilter()->matchAny())
+            filter->parentRenderPassFilter()->removeMatch(criterion);
     }
 }
 
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index 15d2e1167..39ab775ba 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -66,17 +66,17 @@ QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent
 {
 }
 
-QList<QFilterKey *> QRenderPassFilter::includes() const
+QList<QFilterKey *> QRenderPassFilter::matchAny() const
 {
     Q_D(const QRenderPassFilter);
-    return d->m_includeList;
+    return d->m_matchList;
 }
 
-void QRenderPassFilter::addInclude(QFilterKey *keyFilter)
+void QRenderPassFilter::addMatch(QFilterKey *keyFilter)
 {
     Q_D(QRenderPassFilter);
-    if (!d->m_includeList.contains(keyFilter)) {
-        d->m_includeList.append(keyFilter);
+    if (!d->m_matchList.contains(keyFilter)) {
+        d->m_matchList.append(keyFilter);
 
         // We need to add it as a child of the current node if it has been declared inline
         // Or not previously added as a child of the current node so that
@@ -87,31 +87,31 @@ void QRenderPassFilter::addInclude(QFilterKey *keyFilter)
 
         if (d->m_changeArbiter != Q_NULLPTR) {
             QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id()));
-            propertyChange->setPropertyName("include");
+            propertyChange->setPropertyName("match");
             propertyChange->setValue(QVariant::fromValue(keyFilter->id()));
             d->notifyObservers(propertyChange);
         }
     }
 }
 
-void QRenderPassFilter::removeInclude(QFilterKey *filterKey)
+void QRenderPassFilter::removeMatch(QFilterKey *filterKey)
 {
     Q_D(QRenderPassFilter);
     if (d->m_changeArbiter != Q_NULLPTR) {
         QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id()));
-        propertyChange->setPropertyName("include");
+        propertyChange->setPropertyName("match");
         propertyChange->setValue(QVariant::fromValue(filterKey->id()));
         d->notifyObservers(propertyChange);
     }
-    d->m_includeList.removeOne(filterKey);
+    d->m_matchList.removeOne(filterKey);
 }
 
 void QRenderPassFilter::copy(const QNode *ref)
 {
     QFrameGraphNode::copy(ref);
     const QRenderPassFilter *other = static_cast<const QRenderPassFilter*>(ref);
-    Q_FOREACH (QFilterKey *c, other->d_func()->m_includeList)
-        addInclude(qobject_cast<QFilterKey *>(QNode::clone(c)));
+    Q_FOREACH (QFilterKey *c, other->d_func()->m_matchList)
+        addMatch(qobject_cast<QFilterKey *>(QNode::clone(c)));
     for (QParameter *p : other->d_func()->m_parameters)
         addParameter(qobject_cast<QParameter *>(QNode::clone(p)));
 }
diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h
index 9cac293d4..eaa0572dd 100644
--- a/src/render/framegraph/qrenderpassfilter.h
+++ b/src/render/framegraph/qrenderpassfilter.h
@@ -61,9 +61,9 @@ public:
     explicit QRenderPassFilter(Qt3DCore::QNode *parent = 0);
     ~QRenderPassFilter();
 
-    QList<QFilterKey*> includes() const;
-    void addInclude(QFilterKey*keyFilter);
-    void removeInclude(QFilterKey*criterion);
+    QList<QFilterKey*> matchAny() const;
+    void addMatch(QFilterKey*keyFilter);
+    void removeMatch(QFilterKey*criterion);
 
     void addParameter(QParameter *p);
     void removeParameter(QParameter *p);
diff --git a/src/render/framegraph/qrenderpassfilter_p.h b/src/render/framegraph/qrenderpassfilter_p.h
index 22cc2fd55..bbca70297 100644
--- a/src/render/framegraph/qrenderpassfilter_p.h
+++ b/src/render/framegraph/qrenderpassfilter_p.h
@@ -68,7 +68,7 @@ public:
 
     Q_DECLARE_PUBLIC(QRenderPassFilter)
     QString m_renderPassName;
-    QList<QFilterKey *> m_includeList;
+    QList<QFilterKey *> m_matchList;
     QList<QParameter *> m_parameters;
 };
 
diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index e125c79da..a36560d09 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -61,7 +61,7 @@ void RenderPassFilter::updateFromPeer(Qt3DCore::QNode *peer)
     m_filters.clear();
     m_parameterPack.clear();
     setEnabled(filter->isEnabled());
-    const auto criteria = filter->includes();
+    const auto criteria = filter->matchAny();
     for (QFilterKey *criterion : criteria)
         appendFilter(criterion->id());
     const auto parameters = filter->parameters();