QAnnotation changes

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

13 files changed, 41 insertions, 41 deletions

diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
index b43340a3f..6e5a843b0 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
@@ -72,7 +72,7 @@ Material {
     ]
 
     effect: Effect {
-        Annotation {
+        FilterKey {
             id: forward
             name: "renderingStyle"
             value: "forward"
@@ -93,7 +93,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -105,7 +105,7 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -117,7 +117,7 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
index c942aa0ba..e5ec0562a 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
@@ -86,7 +86,7 @@ Material {
 
     effect: Effect {
 
-        Annotation {
+        FilterKey {
             id: forward
             name: "renderingStyle"
             value: "forward"
@@ -107,7 +107,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -119,7 +119,7 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -131,7 +131,7 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
index fada8b240..646e787e6 100644
--- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
+++ b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
@@ -48,7 +48,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/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
index eef76c7ee..51c656ae0 100644
--- a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
@@ -64,7 +64,7 @@ Material {
 
     effect: Effect {
 
-        Annotation {
+        FilterKey {
             id: forward
             name: "renderingStyle"
             value: "forward"
@@ -83,7 +83,7 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -97,7 +97,7 @@ Material {
 
             // GL 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -111,7 +111,7 @@ Material {
 
             // ES 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
index 9fe945a91..6dfbf98c1 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
@@ -87,7 +87,7 @@ Material {
     ]
 
     effect: Effect {
-        Annotation {
+        FilterKey {
             id: forward
             name: "renderingStyle"
             value: "forward"
@@ -111,7 +111,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -123,7 +123,7 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -135,7 +135,7 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
index ad3610b3a..eeb1d33d4 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
@@ -88,7 +88,7 @@ Material {
 
     effect: Effect {
 
-        Annotation {
+        FilterKey {
             id: forward
             name: "renderingStyle"
             value: "forward"
@@ -109,7 +109,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -121,7 +121,7 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -133,7 +133,7 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
index 895f83796..d2c0efda0 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
@@ -101,7 +101,7 @@ Material {
 
     effect: Effect {
 
-        Annotation {
+        FilterKey {
             id: forward
             name: "renderingStyle"
             value: "forward"
@@ -122,7 +122,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -134,7 +134,7 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -146,7 +146,7 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
index 0a3d925ec..9e286f459 100644
--- a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
@@ -57,7 +57,7 @@ Material {
 
     effect: Effect {
 
-        Annotation {
+        FilterKey {
             id: forward
             name: "renderingStyle"
             value: "forward"
@@ -66,7 +66,7 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -80,7 +80,7 @@ Material {
 
             // GL 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -94,7 +94,7 @@ Material {
 
             // ES 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
index 750570727..adccd7c04 100644
--- a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
@@ -63,7 +63,7 @@ Material {
 
     effect: Effect {
 
-        Annotation {
+        FilterKey {
             id: forward
             name: "renderingStyle"
             value: "forward"
@@ -80,7 +80,7 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -102,7 +102,7 @@ Material {
 
             // GL 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -124,7 +124,7 @@ Material {
 
             // ES 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
index bb5ac216e..e60bcefc8 100644
--- a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
@@ -62,7 +62,7 @@ Material {
 
     effect: Effect {
 
-        Annotation {
+        FilterKey {
             id: forward
             name: "renderingStyle"
             value: "forward"
@@ -78,7 +78,7 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -92,7 +92,7 @@ Material {
 
             // GL 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -106,7 +106,7 @@ Material {
 
             // ES 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
index 4d5b77f2b..b03e843e7 100644
--- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
+++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
@@ -90,7 +90,7 @@ Entity {
         parameters: Parameter { name: "skyboxTexture"; value: skyboxTexture}
 
         effect: Effect {
-            Annotation {
+            FilterKey {
                 id: forward
                 name: "renderingStyle"
                 value: "forward"
diff --git a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
index e10d2d57e..d5f99445b 100644
--- a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
@@ -59,7 +59,7 @@ Material {
 
     effect: Effect {
 
-        Annotation {
+        FilterKey {
             id: forward
             name: "renderingStyle"
             value: "forward"
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 3eaefa5a0..bb2e8e947 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -54,7 +54,7 @@
 #include <Qt3DRender/qcameraselector.h>
 #include <Qt3DRender/qeffect.h>
 #include <Qt3DRender/qparameter.h>
-#include <Qt3DRender/qannotation.h>
+#include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qcuboidmesh.h>
 #include <Qt3DRender/qconemesh.h>
 #include <Qt3DRender/qcylindermesh.h>
@@ -189,7 +189,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QSceneLoader, Qt3DRender::Render::Quick::Quick3DScene>("QSceneLoader", "Qt3D.Render/SceneLoader", uri, 2, 0, "SceneLoader");
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QEffect, Qt3DRender::Render::Quick::Quick3DEffect>("QEffect", "Qt3D.Render/Effect", uri, 2, 0, "Effect");
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTechnique, Qt3DRender::Render::Quick::Quick3DTechnique>("QTechnique", "Qt3D.Render/Technique", uri, 2, 0, "Technique");
-    qmlRegisterType<Qt3DRender::QAnnotation>(uri, 2, 0, "Annotation");
+    qmlRegisterType<Qt3DRender::QFilterKey>(uri, 2, 0, "FilterKey");
     qmlRegisterType<Qt3DRender::QGraphicsApiFilter>(uri, 2, 0, "GraphicsApiFilter");
     qmlRegisterUncreatableType<Qt3DRender::QParameter>(uri, 2, 0, "QParameter", "Quick3D should instantiate Quick3DParameter only");
     qmlRegisterType<Qt3DRender::Render::Quick::Quick3DParameter>(uri, 2, 0, "Parameter");