QAnnotation changes

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

6 files changed, 34 insertions, 34 deletions

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")