Follow Annotation API changes.

Change-Id: I9bb7fbe438d942d2cb776ab8cd3d8301a5862524
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

7 files changed, 11 insertions, 11 deletions

diff --git a/examples/qt3d/bigscene-instanced-qml/main.qml b/examples/qt3d/bigscene-instanced-qml/main.qml
index 358128009..79fb09533 100644
--- a/examples/qt3d/bigscene-instanced-qml/main.qml
+++ b/examples/qt3d/bigscene-instanced-qml/main.qml
@@ -99,7 +99,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/planets-qml/CloudEffectDS.qml b/examples/qt3d/planets-qml/CloudEffectDS.qml
index 19dae59ff..4f07559e3 100644
--- a/examples/qt3d/planets-qml/CloudEffectDS.qml
+++ b/examples/qt3d/planets-qml/CloudEffectDS.qml
@@ -76,7 +76,7 @@ Effect {
 
             renderPasses: [
                 RenderPass {
-                    filterKeys: [ Annotation { name : "pass"; value : "forward" } ]
+                    filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetD.vert")
diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
index ff21cccaa..d1562366c 100644
--- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
+++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
@@ -169,7 +169,7 @@ Material {
                     },
                     // TEXTURE PASS + UBO
                     RenderPass {
-                        filterKeys : [Annotation {name : "Name"; value : "Texture" }]
+                        filterKeys : [FilterKey {name : "Name"; value : "Texture" }]
 
                         renderStates : [BlendEquationArguments {sourceRgb: BlendEquationArguments.One; destinationRgb : BlendEquationArguments.One},
                                         BlendEquation {blendFunction: BlendEquation.Add},
diff --git a/examples/qt3d/shadow-map-qml/doc/src/shadow-map-qml.qdoc b/examples/qt3d/shadow-map-qml/doc/src/shadow-map-qml.qdoc
index df0966b24..002b455b5 100644
--- a/examples/qt3d/shadow-map-qml/doc/src/shadow-map-qml.qdoc
+++ b/examples/qt3d/shadow-map-qml/doc/src/shadow-map-qml.qdoc
@@ -221,7 +221,7 @@
     \printuntil }
 
     Inside the technique, we finally have the definition of our two rendering
-    passes. We \e tag each pass with an \l Annotation entity, matching the ones
+    passes. We \e tag each pass with an \l FilterKey entity, matching the ones
     we specified in the framegraph configuration, so that each pass will have
     different rendering settings:
 
diff --git a/examples/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml
index 814b120aa..b9b88b26a 100644
--- a/examples/qt3d/transparency-qml/main.qml
+++ b/examples/qt3d/transparency-qml/main.qml
@@ -161,7 +161,7 @@ Entity {
             techniques: [
                 Technique
                 {
-                    annotations: [ forward ]
+                    filterKeys: [ forward ]
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGL
                         profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
index b03e843e7..f3cb1f3bf 100644
--- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
+++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
@@ -99,7 +99,7 @@ Entity {
             techniques: [
                 // GL3 Technique
                 Technique {
-                    annotations: [ forward ]
+                    filterKeys: [ forward ]
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGL
                         profile: GraphicsApiFilter.CoreProfile
@@ -116,7 +116,7 @@ Entity {
                     }
                 },
                 Technique {
-                    annotations: [ forward ]
+                    filterKeys: [ forward ]
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGL
                         profile: GraphicsApiFilter.NoProfile
@@ -132,7 +132,7 @@ Entity {
                     }
                 },
                 Technique {
-                    annotations: [ forward ]
+                    filterKeys: [ forward ]
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGLES
                         profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
index d5f99445b..28d3a1713 100644
--- a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
@@ -82,7 +82,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -96,7 +96,7 @@ Material {
 
             // GL 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     majorVersion: 2
@@ -109,7 +109,7 @@ Material {
 
             // ES 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile