From c01bc22c287e58186a285b3f8507711fd982fd05 Mon Sep 17 00:00:00 2001 From: Franck Arrecot Date: Thu, 3 Mar 2016 12:57:38 +0100 Subject: QAnnotation changes Task-number: QTBUG-51454 Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4 Reviewed-by: Paul Lemire --- examples/qt3d/wave/BackgroundEffect.qml | 2 +- examples/qt3d/wave/WaveEffect.qml | 2 +- examples/qt3d/wave/WaveForwardRenderer.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/qt3d/wave') 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 -- cgit v1.2.3