QAnnotation changes

Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

35 files changed, 108 insertions, 108 deletions

diff --git a/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml b/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml
index 930d26007..512e9f920 100644
--- a/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml
+++ b/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml
@@ -79,7 +79,7 @@ Effect {
                 // Capping pass: generate planes given clipping plane equations
                 // to be rendered with the phong material
                 RenderPass {
-                    annotations: Annotation { name: "pass"; value: "capping" }
+                    filterKeys: FilterKey { name: "pass"; value: "capping" }
                     shaderProgram: ShaderProgram {
                         vertexShaderCode: loadSource("qrc:/capping.vert")
                         geometryShaderCode: loadSource("qrc:/capping.geom")
diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
index 69e21c4e8..008d40e05 100644
--- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
+++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
@@ -78,7 +78,7 @@ Viewport {
                     ClearBuffer {
                         buffers: ClearBuffer.ColorDepthBuffer
                         RenderPassFilter {
-                            includes: Annotation { name: "pass"; value: "material" }
+                            includes: FilterKey { name: "pass"; value: "material" }
                         }
                     }
                 }
@@ -113,7 +113,7 @@ Viewport {
                         LayerFilter {
                             layers: "content"
                             RenderPassFilter {
-                                includes: Annotation { name: "pass"; value: "stencilFill"; }
+                                includes: FilterKey { name: "pass"; value: "stencilFill"; }
                             }
                         }
                     }
@@ -126,7 +126,7 @@ Viewport {
                 LayerFilter {
                     layers: "caps"
                     RenderPassFilter {
-                        includes: Annotation { name: "pass"; value: "capping"; }
+                        includes: FilterKey { name: "pass"; value: "capping"; }
                     }
                 }
 
diff --git a/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml b/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml
index d6b100089..7132831ed 100644
--- a/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml
+++ b/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml
@@ -78,7 +78,7 @@ Effect {
 
                 // Draw mesh with PhongMaterial and additional clipping planes
                 RenderPass {
-                    annotations: Annotation { name: "pass"; value: "material" }
+                    filterKeys: FilterKey { name: "pass"; value: "material" }
                     shaderProgram: ShaderProgram {
                         vertexShaderCode: loadSource("qrc:/phong-clip.vert")
                         fragmentShaderCode: loadSource("qrc:/phong-clip.frag")
@@ -87,7 +87,7 @@ Effect {
 
                 // Basic stencil fill pass
                 RenderPass {
-                    annotations: Annotation { name: "pass"; value: "stencilFill" }
+                    filterKeys: FilterKey { name: "pass"; value: "stencilFill" }
                     shaderProgram: ShaderProgram {
                         vertexShaderCode: loadSource("qrc:/phong-clip.vert")
                         fragmentShaderCode: loadSource("qrc:/passthrough.frag")
diff --git a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
index 8df218ae3..43c853ebc 100644
--- a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
+++ b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
@@ -103,7 +103,7 @@ Material {
                         },
                         BlendEquation {blendFunction: BlendEquation.Add}
                     ]
-                    annotations: Annotation { name: "pass"; value: "material" }
+                    filterKeys: FilterKey { name: "pass"; value: "material" }
                 }
             },
 
@@ -125,7 +125,7 @@ Material {
                         },
                         BlendEquation {blendFunction: BlendEquation.Add}
                     ]
-                    annotations: Annotation { name: "pass"; value: "material" }
+                    filterKeys: FilterKey { name: "pass"; value: "material" }
                 }
             }
         ]
diff --git a/examples/qt3d/compute-particles/ComputeFrameGraph.qml b/examples/qt3d/compute-particles/ComputeFrameGraph.qml
index 8f03ba0aa..0cd43f6d2 100644
--- a/examples/qt3d/compute-particles/ComputeFrameGraph.qml
+++ b/examples/qt3d/compute-particles/ComputeFrameGraph.qml
@@ -68,7 +68,7 @@ Viewport {
             workGroupX: 1024; workGroupY: 1; workGroupZ: 1
             TechniqueFilter {
                 matchAll: [
-                    Annotation { name: "type"; value: "compute"}
+                    FilterKey { name: "type"; value: "compute"}
                 ]
             }
         }
@@ -78,7 +78,7 @@ Viewport {
             id: selector
             TechniqueFilter {
                 matchAll: [
-                    Annotation { name: "type"; value: "draw"}
+                    FilterKey { name: "type"; value: "draw"}
                 ]
             }
         }
diff --git a/examples/qt3d/compute-particles/ComputeMaterial.qml b/examples/qt3d/compute-particles/ComputeMaterial.qml
index 01fef2bd9..3f09fc9ef 100644
--- a/examples/qt3d/compute-particles/ComputeMaterial.qml
+++ b/examples/qt3d/compute-particles/ComputeMaterial.qml
@@ -84,8 +84,8 @@ Material {
                         ]
                     }
                 ]
-                annotations: [
-                    Annotation { name: "type"; value: "compute" }
+                filterKeys: [
+                    FilterKey { name: "type"; value: "compute" }
                 ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
@@ -102,8 +102,8 @@ Material {
                         // Vertex buffers attributes that will be used to position and color
                     }
                 ]
-                annotations: [
-                    Annotation { name: "type"; value: "draw" }
+                filterKeys: [
+                    FilterKey { name: "type"; value: "draw" }
                 ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
index fa629dd73..5981de9ed 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
@@ -77,15 +77,15 @@ void DeferredRenderer::setGBuffer(Qt3DRender::QRenderTarget *gBuffer)
     m_gBufferTargetSelector->setTarget(gBuffer);
 }
 
-void DeferredRenderer::setGeometryPassCriteria(QList<Qt3DRender::QAnnotation *> criteria)
+void DeferredRenderer::setGeometryPassCriteria(QList<Qt3DRender::QFilterKey *> criteria)
 {
-    Q_FOREACH (Qt3DRender::QAnnotation *c, criteria)
+    Q_FOREACH (Qt3DRender::QFilterKey *c, criteria)
         m_geometryPassFilter->addInclude(c);
 }
 
-void DeferredRenderer::setFinalPassCriteria(QList<Qt3DRender::QAnnotation *> criteria)
+void DeferredRenderer::setFinalPassCriteria(QList<Qt3DRender::QFilterKey *> criteria)
 {
-    Q_FOREACH (Qt3DRender::QAnnotation *c, criteria)
+    Q_FOREACH (Qt3DRender::QFilterKey *c, criteria)
         c->setParent(m_finalPassFilter);
 }
 
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
index 71a0f9dbd..8f37d4b5a 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
@@ -58,7 +58,7 @@
 #include <Qt3DRender/QRenderTargetSelector>
 #include <Qt3DRender/QRenderSurfaceSelector>
 #include <Qt3DRender/QCameraSelector>
-#include <Qt3DRender/QAnnotation>
+#include <Qt3DRender/QFilterKey>
 
 class DeferredRenderer : public Qt3DRender::QViewport
 {
@@ -67,8 +67,8 @@ public:
 
     void setSceneCamera(Qt3DCore::QEntity *camera);
     void setGBuffer(Qt3DRender::QRenderTarget *gBuffer);
-    void setGeometryPassCriteria(QList<Qt3DRender::QAnnotation *> criteria);
-    void setFinalPassCriteria(QList<Qt3DRender::QAnnotation *> criteria);
+    void setGeometryPassCriteria(QList<Qt3DRender::QFilterKey *> criteria);
+    void setFinalPassCriteria(QList<Qt3DRender::QFilterKey *> criteria);
     void setGBufferLayers(const QStringList &layerName);
     void setScreenQuadLayers(const QStringList &layerName);
 
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
index db51058d9..63c821caa 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
@@ -60,7 +60,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
     , m_gl2Technique(new Qt3DRender::QTechnique())
     , m_gl2Pass(new Qt3DRender::QRenderPass())
     , m_gl3Pass(new Qt3DRender::QRenderPass())
-    , m_passCriterion(new Qt3DRender::QAnnotation(this))
+    , m_passCriterion(new Qt3DRender::QFilterKey(this))
 {
     m_gl3Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL);
     m_gl3Technique->graphicsApiFilter()->setMajorVersion(3);
@@ -79,7 +79,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
     gl3Shader->setVertexShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.vert"))));
     gl3Shader->setFragmentShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.frag"))));
 
-    m_gl3Pass->addAnnotation(m_passCriterion);
+    m_gl3Pass->addFilterKey(m_passCriterion);
     m_gl3Pass->setShaderProgram(gl3Shader);
     m_gl3Technique->addRenderPass(m_gl3Pass);
 
@@ -87,7 +87,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
     gl2Shader->setVertexShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.vert"))));
     gl2Shader->setFragmentShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.frag"))));
 
-    m_gl2Pass->addAnnotation(m_passCriterion);
+    m_gl2Pass->addFilterKey(m_passCriterion);
     m_gl2Pass->setShaderProgram(gl2Shader);
     m_gl2Technique->addRenderPass(m_gl2Pass);
 
@@ -95,7 +95,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3DRender::QAnnotation *> FinalEffect::passCriteria() const
+QList<Qt3DRender::QFilterKey *> FinalEffect::passCriteria() const
 {
-    return QList<Qt3DRender::QAnnotation *>() << m_passCriterion;
+    return QList<Qt3DRender::QFilterKey *>() << m_passCriterion;
 }
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
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
index 047e43f32..bdb6ea76e 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
@@ -60,7 +60,7 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
     , m_gl2Technique(new Qt3DRender::QTechnique())
     , m_gl2Pass(new Qt3DRender::QRenderPass())
     , m_gl3Pass(new Qt3DRender::QRenderPass())
-    , m_passCriterion(new Qt3DRender::QAnnotation(this))
+    , m_passCriterion(new Qt3DRender::QFilterKey(this))
 {
 
     m_gl3Technique->graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::NoProfile);
@@ -81,7 +81,7 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
     gl3Shader->setVertexShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.vert"))));
     gl3Shader->setFragmentShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.frag"))));
 
-    m_gl3Pass->addAnnotation(m_passCriterion);
+    m_gl3Pass->addFilterKey(m_passCriterion);
     m_gl3Pass->setShaderProgram(gl3Shader);
     m_gl3Technique->addRenderPass(m_gl3Pass);
 
@@ -89,7 +89,7 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
     gl2Shader->setVertexShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.vert"))));
     gl2Shader->setFragmentShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.frag"))));
 
-    m_gl2Pass->addAnnotation(m_passCriterion);
+    m_gl2Pass->addFilterKey(m_passCriterion);
     m_gl2Pass->setShaderProgram(gl2Shader);
     m_gl2Technique->addRenderPass(m_gl2Pass);
 
@@ -97,7 +97,7 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3DRender::QAnnotation *> SceneEffect::passCriteria() const
+QList<Qt3DRender::QFilterKey *> SceneEffect::passCriteria() const
 {
-    return QList<Qt3DRender::QAnnotation *>() << m_passCriterion;
+    return QList<Qt3DRender::QFilterKey *>() << m_passCriterion;
 }
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
index abae0dd62..eb361c273 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
@@ -59,14 +59,14 @@ class SceneEffect : public Qt3DRender::QEffect
 public:
     explicit SceneEffect(Qt3DCore::QNode *parent = 0);
 
-    QList<Qt3DRender::QAnnotation *> passCriteria() const;
+    QList<Qt3DRender::QFilterKey *> passCriteria() const;
 
 private:
     Qt3DRender::QTechnique *m_gl3Technique;
     Qt3DRender::QTechnique *m_gl2Technique;
     Qt3DRender::QRenderPass *m_gl2Pass;
     Qt3DRender::QRenderPass *m_gl3Pass;
-    Qt3DRender::QAnnotation *m_passCriterion;
+    Qt3DRender::QFilterKey *m_passCriterion;
 };
 
 #endif // SCENEEFFECT_H
diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
index 20387ef3f..6b87d468f 100644
--- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
+++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
@@ -69,7 +69,7 @@ Viewport {
 
                     RenderPassFilter {
                         id : geometryPass
-                        includes : Annotation { name : "pass"; value : "geometry" }
+                        includes : FilterKey { name : "pass"; value : "geometry" }
 
                         CameraSelector {
                             id : sceneCameraSelector
@@ -87,7 +87,7 @@ Viewport {
 
                 RenderPassFilter {
                     id : finalPass
-                    includes : Annotation { name : "pass"; value : "final" }
+                    includes : FilterKey { name : "pass"; value : "final" }
                     CameraSelector {
                         camera: sceneCameraSelector.camera
                     }
diff --git a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
index 0790e09b5..482ad91cc 100644
--- a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
+++ b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
@@ -65,7 +65,7 @@ Effect {
                 }
             }
             renderPasses : RenderPass {
-                annotations : Annotation { name : "pass"; value : "final" }
+                filterKeys : FilterKey { name : "pass"; value : "final" }
                 shaderProgram : ShaderProgram {
                     id : finalShaderGL3
                     vertexShaderCode:
@@ -133,7 +133,7 @@ Effect {
                             }
                         }
             renderPasses : RenderPass {
-                annotations : Annotation { name : "pass"; value : "final" }
+                filterKeys : FilterKey { name : "pass"; value : "final" }
                 shaderProgram : ShaderProgram {
                     id : finalShaderGL2
                     vertexShaderCode:
diff --git a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
index 9b2119185..5dbfdae63 100644
--- a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
+++ b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
@@ -58,7 +58,7 @@ Effect {
         Technique {
             graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
             renderPasses : RenderPass {
-                annotations : Annotation { name : "pass"; value : "geometry" }
+                filterKeys : FilterKey { name : "pass"; value : "geometry" }
                 shaderProgram : ShaderProgram {
                     id : sceneShaderGL3
                     vertexShaderCode:
@@ -109,7 +109,7 @@ Effect {
         Technique {
             graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 0; majorVersion : 2 }
             renderPasses : RenderPass {
-                annotations : Annotation { name : "pass"; value : "geometry" }
+                filterKeys : FilterKey { name : "pass"; value : "geometry" }
                 shaderProgram : ShaderProgram {
                     id : sceneShaderGL2
                     vertexShaderCode:
diff --git a/examples/qt3d/instanced-arrays-qml/main.qml b/examples/qt3d/instanced-arrays-qml/main.qml
index 2b2d01249..c1478e965 100644
--- a/examples/qt3d/instanced-arrays-qml/main.qml
+++ b/examples/qt3d/instanced-arrays-qml/main.qml
@@ -91,7 +91,7 @@ Entity {
                     minorVersion: 2
                     majorVersion: 3
                 }
-                annotations: Annotation { name: "renderingStyle"; value: "forward" }
+                filterKeys: FilterKey { name: "renderingStyle"; value: "forward" }
                 renderPasses: RenderPass {
                     shaderProgram: ShaderProgram {
                         vertexShaderCode: loadSource("qrc:/instanced.vert")
diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml
index c92104b9c..0c477d2fa 100644
--- a/examples/qt3d/materials/SortedForwardRenderer.qml
+++ b/examples/qt3d/materials/SortedForwardRenderer.qml
@@ -60,7 +60,7 @@ TechniqueFilter {
     property alias window: surfaceSelector.window
 
     // Select the forward rendering Technique of any used Effect
-    matchAll: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+    matchAll: [ FilterKey { name: "renderingStyle"; value: "forward" } ]
 
     RenderSurfaceSelector {
         id: surfaceSelector
diff --git a/examples/qt3d/planets-qml/CloudEffectDS.qml b/examples/qt3d/planets-qml/CloudEffectDS.qml
index c0f01d093..19dae59ff 100644
--- a/examples/qt3d/planets-qml/CloudEffectDS.qml
+++ b/examples/qt3d/planets-qml/CloudEffectDS.qml
@@ -72,11 +72,11 @@ Effect {
                 minorVersion: 2
             }
 
-            annotations: [ Annotation { name: "name"; value: "Desktop" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "Desktop" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ Annotation { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetD.vert")
@@ -93,11 +93,11 @@ Effect {
                 majorVersion: 2
             }
 
-            annotations: [ Annotation { name: "name"; value: "ES2" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "ES2" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
@@ -115,11 +115,11 @@ Effect {
                 minorVersion: 0
             }
 
-            annotations: [ Annotation { name: "name"; value: "ES2" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "ES2" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
diff --git a/examples/qt3d/planets-qml/PlanetEffectD.qml b/examples/qt3d/planets-qml/PlanetEffectD.qml
index 0e556741f..d8660650f 100644
--- a/examples/qt3d/planets-qml/PlanetEffectD.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectD.qml
@@ -73,11 +73,11 @@ Effect {
                 minorVersion: 2
             }
 
-            annotations: [ Annotation { name: "name"; value: "Desktop" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "Desktop" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetD.vert")
@@ -94,11 +94,11 @@ Effect {
                 majorVersion: 2
             }
 
-            annotations: [ Annotation { name: "name"; value: "ES2" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "ES2" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
@@ -116,11 +116,11 @@ Effect {
                 minorVersion: 0
             }
 
-            annotations: [ Annotation { name: "name"; value: "ES2" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "ES2" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
diff --git a/examples/qt3d/planets-qml/PlanetEffectDB.qml b/examples/qt3d/planets-qml/PlanetEffectDB.qml
index 15e38dd7d..40af57fce 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDB.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDB.qml
@@ -73,11 +73,11 @@ Effect {
                 minorVersion: 2
             }
 
-            annotations: [ Annotation { name: "name"; value: "Desktop" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "Desktop" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetDB.vert")
@@ -94,11 +94,11 @@ Effect {
                 majorVersion: 2
             }
 
-            annotations: [ Annotation { name: "name"; value: "ES2" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "ES2" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetDB.vert")
@@ -116,11 +116,11 @@ Effect {
                 minorVersion: 0
             }
 
-            annotations: [ Annotation { name: "name"; value: "ES2" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "ES2" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetDB.vert")
diff --git a/examples/qt3d/planets-qml/PlanetEffectDSB.qml b/examples/qt3d/planets-qml/PlanetEffectDSB.qml
index f45d66dba..b9cda657a 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDSB.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDSB.qml
@@ -73,11 +73,11 @@ Effect {
                 minorVersion: 2
             }
 
-            annotations: [ Annotation { name: "name"; value: "Desktop" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "Desktop" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetDB.vert")
@@ -94,11 +94,11 @@ Effect {
                 majorVersion: 2
             }
 
-            annotations: [ Annotation { name: "name"; value: "ES2" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "ES2" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetDB.vert")
@@ -116,11 +116,11 @@ Effect {
                 minorVersion: 0
             }
 
-            annotations: [ Annotation { name: "name"; value: "ES2" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "ES2" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetDB.vert")
diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
index 52101c7eb..d575637d4 100644
--- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml
+++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
@@ -64,11 +64,11 @@ RenderSettings {
         clearColor: Qt.rgba(0.0, 0.0, 0.0, 1.0)
 
         TechniqueFilter {
-            matchAll: [ Annotation { name: "name"; value: "Desktop" } ]
+            matchAll: [ FilterKey { name: "name"; value: "Desktop" } ]
 
 
             RenderPassFilter {
-                includes: [ Annotation { name: "pass"; value: "shadowmap" } ]
+                includes: [ FilterKey { name: "pass"; value: "shadowmap" } ]
 
                 RenderTargetSelector {
                     target: RenderTarget {
@@ -107,7 +107,7 @@ RenderSettings {
         }
 
         RenderPassFilter {
-            includes: [ Annotation { name: "pass"; value: "forward" } ]
+            includes: [ FilterKey { name: "pass"; value: "forward" } ]
 
             ClearBuffer {
                 buffers: ClearBuffer.ColorDepthBuffer
diff --git a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
index d314863c9..05022586a 100644
--- a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
+++ b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
@@ -74,11 +74,11 @@ Effect {
                 minorVersion: 2
             }
 
-            annotations: [ Annotation { name: "name"; value: "Desktop" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "Desktop" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name: "pass"; value: "shadowmap" } ]
+                    filterKeys: [ FilterKey { name: "pass"; value: "shadowmap" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/shadowmap.vert")
@@ -91,7 +91,7 @@ Effect {
                     ]
                 },
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetD.vert")
@@ -108,11 +108,11 @@ Effect {
                 majorVersion: 2
             }
 
-            annotations: [ Annotation { name: "name"; value: "ES2" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "ES2" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
@@ -130,11 +130,11 @@ Effect {
                 minorVersion: 0
             }
 
-            annotations: [ Annotation { name: "name"; value: "ES2" } ]
+            filterKeys: [ FilterKey { name: "name"; value: "ES2" } ]
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
diff --git a/examples/qt3d/plasma/main.qml b/examples/qt3d/plasma/main.qml
index 0ebf75a45..96927cd4c 100644
--- a/examples/qt3d/plasma/main.qml
+++ b/examples/qt3d/plasma/main.qml
@@ -74,7 +74,7 @@ Entity {
 
                 effect: Effect {
                     techniques: Technique {
-                        annotations: [ Annotation{ name: "renderingStyle"; value: "forward" } ]
+                        filterKeys: [ FilterKey{ name: "renderingStyle"; value: "forward" } ]
 
                         graphicsApiFilter {
                             minorVersion: 3
diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
index 880ab0b1a..ff21cccaa 100644
--- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
+++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
@@ -149,9 +149,9 @@ Material {
             Technique {
                 graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
 
-                annotations: [
-                    Annotation { name : "RenderingStyle"; value : "forward"},
-                    Annotation { name : "Enabled"; value: enabled }
+                filterKeys: [
+                    FilterKey { name : "RenderingStyle"; value : "forward"},
+                    FilterKey { name : "Enabled"; value: enabled }
                 ]
 
                 parameters : Parameter { name : "lightPos"; value : Qt.vector4d(10.0, 10.0, 0.0, 1.0)}
@@ -159,7 +159,7 @@ Material {
                 renderPasses : [
                     // COLOR PASS
                     RenderPass {
-                        annotations: Annotation {name: "Name"; value: "ColorMaterial"}
+                        filterKeys: FilterKey {name: "Name"; value: "ColorMaterial"}
 
                         shaderProgram: ShaderProgram {
                             id: diffuseShader
@@ -169,7 +169,7 @@ Material {
                     },
                     // TEXTURE PASS + UBO
                     RenderPass {
-                        annotations : [Annotation {name : "Name"; value : "Texture" }]
+                        filterKeys : [Annotation {name : "Name"; value : "Texture" }]
 
                         renderStates : [BlendEquationArguments {sourceRgb: BlendEquationArguments.One; destinationRgb : BlendEquationArguments.One},
                                         BlendEquation {blendFunction: BlendEquation.Add},
diff --git a/examples/qt3d/playground-qml/ComplexTechnique.qml b/examples/qt3d/playground-qml/ComplexTechnique.qml
index 094ae27c4..4cec14485 100644
--- a/examples/qt3d/playground-qml/ComplexTechnique.qml
+++ b/examples/qt3d/playground-qml/ComplexTechnique.qml
@@ -52,14 +52,14 @@ import Qt3D.Core 2.0
 import Qt3D.Render 2.0
 
 Technique {
-    annotations : [
-        Annotation { name : "RenderingStyle"; value : "forward"},
-        Annotation { name : "Enabled"; value : true}
+    filterKeys : [
+        FilterKey { name : "RenderingStyle"; value : "forward"},
+        FilterKey { name : "Enabled"; value : true}
     ]
     graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
     renderPasses : [
         RenderPass {
-            annotations : [Annotation {name : "Name"; value : "TextureLighting" }]
+            filterKeys : [FilterKey {name : "Name"; value : "TextureLighting" }]
 
             shaderProgram : ShaderProgram {
                 id : textureShaderLighting
@@ -117,7 +117,7 @@ Technique {
             }
         },
         RenderPass {
-            annotations : [Annotation {name : "Name"; value : "Texture" }]
+            filterKeys : [FilterKey {name : "Name"; value : "Texture" }]
             shaderProgram : ShaderProgram {
                 vertexShaderCode : "
                 #version 140
@@ -147,7 +147,7 @@ Technique {
             }
         },
         RenderPass {
-            annotations : [Annotation {name : "Name"; value : "Lighting" }]
+            filterKeys : [FilterKey {name : "Name"; value : "Lighting" }]
             renderStates : [BlendEquationArguments {sourceRgb: BlendEquationArguments.One; destinationRgb : BlendEquationArguments.One},
                 BlendEquation {blendFunction: BlendEquation.Add},
                 CullFace { mode : CullFace.Back },
@@ -204,7 +204,7 @@ Technique {
             }
         },
         RenderPass {
-            annotations : Annotation {name : "Name"; value : "Final" }
+            filterKeys : FilterKey {name : "Name"; value : "Final" }
             shaderProgram : ShaderProgram {
                 vertexShaderCode: "
                 #version 140
diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml
index 9fe5032a3..ccbdc8536 100644
--- a/examples/qt3d/playground-qml/MyForwardRenderer.qml
+++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml
@@ -69,8 +69,8 @@ TechniqueFilter {
     property alias clearColor: viewport.clearColor
 
     matchAll : [
-        Annotation { name: "RenderingStyle"; value: "forward";},
-        Annotation { name: "Enabled"; value: true;}
+        FilterKey { name: "RenderingStyle"; value: "forward";},
+        FilterKey { name: "Enabled"; value: true;}
     ]
 
     ClearBuffer {
@@ -87,7 +87,7 @@ TechniqueFilter {
                 LayerFilter {
                     id: layerFilter
                     RenderPassFilter { includes: [
-                            Annotation {name : "Name"; value : "Texture"}
+                            FilterKey {name : "Name"; value : "Texture"}
                         ] }
                 }
             }
@@ -101,7 +101,7 @@ TechniqueFilter {
         CameraSelector {
             id: detailCameraSelector
             RenderPassFilter {
-                includes: [ Annotation { name: "Name"; value: "ColorMaterial"; } ]
+                includes: [ FilterKey { name: "Name"; value: "ColorMaterial"; } ]
             }
         }
     }
diff --git a/examples/qt3d/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml
index 01ca38639..9bc81bf4c 100644
--- a/examples/qt3d/shadow-map-qml/AdsEffect.qml
+++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml
@@ -84,7 +84,7 @@ Effect {
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name: "pass"; value: "shadowmap" } ]
+                    filterKeys: [ FilterKey { name: "pass"; value: "shadowmap" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/shadowmap.vert")
@@ -98,7 +98,7 @@ Effect {
                 },
 
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/ads.vert")
@@ -118,7 +118,7 @@ Effect {
 
             renderPasses: [
                 RenderPass {
-                    annotations: [ Annotation { name: "pass"; value: "shadowmap" } ]
+                    filterKeys: [ FilterKey { name: "pass"; value: "shadowmap" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es3/shadowmap.vert")
@@ -132,7 +132,7 @@ Effect {
                 },
 
                 RenderPass {
-                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es3/ads.vert")
diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
index afccb2082..2a510b40b 100644
--- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
@@ -65,7 +65,7 @@ RenderSettings {
 
         RenderSurfaceSelector {
             RenderPassFilter {
-                includes: [ Annotation { name: "pass"; value: "shadowmap" } ]
+                includes: [ FilterKey { name: "pass"; value: "shadowmap" } ]
 
                 RenderTargetSelector {
                     target: RenderTarget {
@@ -102,8 +102,8 @@ RenderSettings {
                 }
             }
 
-            RenderPassFilter {
-                includes: [ Annotation { name: "pass"; value: "forward" } ]
+        RenderPassFilter {
+            includes: [ FilterKey { name: "pass"; value: "forward" } ]
 
                 ClearBuffer {
                     buffers: ClearBuffer.ColorDepthBuffer
diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
index 5d4841c2a..936ad5536 100644
--- a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
+++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
@@ -79,7 +79,7 @@ Effect {
                 minorVersion: 0
             }
 
-            annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+            filterKeys: [ FilterKey { name: "renderingStyle"; value: "forward" } ]
 
             parameters: [
                 Parameter { name: "light.position"; value: Qt.vector4d(0.0, 0.0, 0.0, 1.0) },
diff --git a/examples/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml
index 3410865e8..814b120aa 100644
--- a/examples/qt3d/transparency-qml/main.qml
+++ b/examples/qt3d/transparency-qml/main.qml
@@ -136,7 +136,7 @@ Entity {
         }
 
         effect:  Effect {
-            Annotation {
+            FilterKey {
                 id: forward
                 name: "renderingStyle"
                 value: "forward"
@@ -186,7 +186,7 @@ Entity {
                 },
                 Technique
                 {
-                    annotations: [ forward ]
+                    filterKeys: [ forward ]
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGLES
                         profile: GraphicsApiFilter.NoProfile
diff --git a/examples/qt3d/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml
index 24bc29450..93c706e36 100644
--- a/examples/qt3d/wave/BackgroundEffect.qml
+++ b/examples/qt3d/wave/BackgroundEffect.qml
@@ -63,7 +63,7 @@ Effect {
                 minorVersion: 1
             }
 
-            annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+            filterKeys: [ FilterKey { name: "renderingStyle"; value: "forward" } ]
 
             renderPasses: [
                 RenderPass {
diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml
index 185c379b5..5609e6def 100644
--- a/examples/qt3d/wave/WaveEffect.qml
+++ b/examples/qt3d/wave/WaveEffect.qml
@@ -78,7 +78,7 @@ Effect {
                 minorVersion: 2
             }
 
-            annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+            filterKeys: [ FilterKey { name: "renderingStyle"; value: "forward" } ]
 
             uniforms: [
                 Parameter { name: "light.position"; value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) },
diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml
index e7f6db824..660633c23 100644
--- a/examples/qt3d/wave/WaveForwardRenderer.qml
+++ b/examples/qt3d/wave/WaveForwardRenderer.qml
@@ -59,7 +59,7 @@ TechniqueFilter {
     property alias window: surfaceSelector.window
 
     // Select the forward rendering Technique of any used Effect
-    matchAll: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+    matchAll: [ FilterKey { name: "renderingStyle"; value: "forward" } ]
 
     RenderSurfaceSelector {
         id: surfaceSelector
diff --git a/examples/qt3d/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml
index 4caa6e735..fb17afa0e 100644
--- a/examples/qt3d/wireframe/WireframeEffect.qml
+++ b/examples/qt3d/wireframe/WireframeEffect.qml
@@ -70,7 +70,7 @@ Effect {
                 minorVersion: 1
             }
 
-            annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+            filterKeys: [ FilterKey { name: "renderingStyle"; value: "forward" } ]
 
             parameters: [
                 Parameter { name: "light.position"; value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) },