diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-03 12:57:38 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-03-17 11:25:16 +0000 |
| commit | c01bc22c287e58186a285b3f8507711fd982fd05 (patch) | |
| tree | 77a5b100d5a02de3cf864672590cdde5d4099301 /examples/qt3d/compute-particles | |
| parent | a8371dccd60a097678239edc510e5bb4624b52b8 (diff) | |
QAnnotation changes
Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/compute-particles')
| -rw-r--r-- | examples/qt3d/compute-particles/ComputeFrameGraph.qml | 4 | ||||
| -rw-r--r-- | examples/qt3d/compute-particles/ComputeMaterial.qml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/qt3d/compute-particles/ComputeFrameGraph.qml b/examples/qt3d/compute-particles/ComputeFrameGraph.qml index 8f03ba0aa..0cd43f6d2 100644 --- a/examples/qt3d/compute-particles/ComputeFrameGraph.qml +++ b/examples/qt3d/compute-particles/ComputeFrameGraph.qml @@ -68,7 +68,7 @@ Viewport { workGroupX: 1024; workGroupY: 1; workGroupZ: 1 TechniqueFilter { matchAll: [ - Annotation { name: "type"; value: "compute"} + FilterKey { name: "type"; value: "compute"} ] } } @@ -78,7 +78,7 @@ Viewport { id: selector TechniqueFilter { matchAll: [ - Annotation { name: "type"; value: "draw"} + FilterKey { name: "type"; value: "draw"} ] } } diff --git a/examples/qt3d/compute-particles/ComputeMaterial.qml b/examples/qt3d/compute-particles/ComputeMaterial.qml index 01fef2bd9..3f09fc9ef 100644 --- a/examples/qt3d/compute-particles/ComputeMaterial.qml +++ b/examples/qt3d/compute-particles/ComputeMaterial.qml @@ -84,8 +84,8 @@ Material { ] } ] - annotations: [ - Annotation { name: "type"; value: "compute" } + filterKeys: [ + FilterKey { name: "type"; value: "compute" } ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL @@ -102,8 +102,8 @@ Material { // Vertex buffers attributes that will be used to position and color } ] - annotations: [ - Annotation { name: "type"; value: "draw" } + filterKeys: [ + FilterKey { name: "type"; value: "draw" } ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL |