From 30b608271609e494ca0dd1dc29b11b61e51250f4 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Sat, 12 Mar 2016 15:24:27 +0100 Subject: Fix accidentally renamed Technique.annotations properties. Change-Id: Ia1fbc14bc22555875ca9f8d2ab8ea781c614a447 Reviewed-by: Sean Harmer --- examples/qt3d/bigscene-instanced-qml/main.qml | 2 +- examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml | 2 +- examples/qt3d/transparency-qml/main.qml | 4 ++-- examples/qt3d/wave/BackgroundEffect.qml | 2 +- examples/qt3d/wave/WaveEffect.qml | 2 +- examples/qt3d/wireframe/WireframeEffect.qml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'examples') diff --git a/examples/qt3d/bigscene-instanced-qml/main.qml b/examples/qt3d/bigscene-instanced-qml/main.qml index 71a82d30a..358128009 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 } - filterKeys: Annotation { name: "renderingStyle"; value: "forward" } + annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ] renderPasses: RenderPass { shaderProgram: ShaderProgram { vertexShaderCode: loadSource("qrc:/instanced.vert") diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml index dee5c5fc6..5d4841c2a 100644 --- a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml +++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml @@ -79,7 +79,7 @@ Effect { minorVersion: 0 } - filterKeys: [ Annotation { name: "renderingStyle"; value: "forward" } ] + annotations: [ Annotation { 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 7ede0390d..3410865e8 100644 --- a/examples/qt3d/transparency-qml/main.qml +++ b/examples/qt3d/transparency-qml/main.qml @@ -161,7 +161,7 @@ Entity { techniques: [ Technique { - filterKeys: forward + annotations: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.NoProfile @@ -186,7 +186,7 @@ Entity { }, Technique { - annotations: forward + annotations: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/examples/qt3d/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml index 587af815d..24bc29450 100644 --- a/examples/qt3d/wave/BackgroundEffect.qml +++ b/examples/qt3d/wave/BackgroundEffect.qml @@ -63,7 +63,7 @@ Effect { minorVersion: 1 } - filterKeys: Annotation { name: "renderingStyle"; value: "forward" } + annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ] renderPasses: [ RenderPass { diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml index 9c3705c0c..bc82be3dd 100644 --- a/examples/qt3d/wave/WaveEffect.qml +++ b/examples/qt3d/wave/WaveEffect.qml @@ -78,7 +78,7 @@ Effect { minorVersion: 2 } - filterKeys: [ Annotation { name: "renderingStyle"; value: "forward" } ] + annotations: [ Annotation { 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/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml index b8a5dfc94..4caa6e735 100644 --- a/examples/qt3d/wireframe/WireframeEffect.qml +++ b/examples/qt3d/wireframe/WireframeEffect.qml @@ -70,7 +70,7 @@ Effect { minorVersion: 1 } - filterKeys: [ Annotation { name: "renderingStyle"; value: "forward" } ] + annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ] parameters: [ Parameter { name: "light.position"; value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) }, -- cgit v1.2.3