summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@theqtcompany.com>2016-03-01 17:49:42 +0200
committerJanne Koskinen <janne.p.koskinen@theqtcompany.com>2016-03-02 08:06:40 +0000
commit4ac71834313da3f5942a56282d4d337aef5a81f3 (patch)
tree67797cf21187742d75fa10485d112facb8ae9bf5 /examples
parent1c4cd066aaa4d51d468aa22d139b08ad8a81e484 (diff)
Renaming QTechniqueFilter API
As per API review. Change-Id: Ib3565b6cce74803fcf4920f125c3444e4b44444e Task-number: QTBUG-51512 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/qt3d/compute-particles/ComputeFrameGraph.qml4
-rw-r--r--examples/qt3d/materials/SortedForwardRenderer.qml2
-rw-r--r--examples/qt3d/planets-qml/PlanetFrameGraph.qml2
-rw-r--r--examples/qt3d/playground-qml/MyForwardRenderer.qml2
-rw-r--r--examples/qt3d/wave/WaveForwardRenderer.qml2
5 files changed, 6 insertions, 6 deletions
diff --git a/examples/qt3d/compute-particles/ComputeFrameGraph.qml b/examples/qt3d/compute-particles/ComputeFrameGraph.qml
index 67ed8f9a9..8f03ba0aa 100644
--- a/examples/qt3d/compute-particles/ComputeFrameGraph.qml
+++ b/examples/qt3d/compute-particles/ComputeFrameGraph.qml
@@ -67,7 +67,7 @@ Viewport {
DispatchCompute {
workGroupX: 1024; workGroupY: 1; workGroupZ: 1
TechniqueFilter {
- requires: [
+ matchAll: [
Annotation { name: "type"; value: "compute"}
]
}
@@ -77,7 +77,7 @@ Viewport {
CameraSelector {
id: selector
TechniqueFilter {
- requires: [
+ matchAll: [
Annotation { name: "type"; value: "draw"}
]
}
diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml
index 7ca9b21e9..1c7258fb5 100644
--- a/examples/qt3d/materials/SortedForwardRenderer.qml
+++ b/examples/qt3d/materials/SortedForwardRenderer.qml
@@ -60,7 +60,7 @@ TechniqueFilter {
property alias window: surfaceSelector.window
// Select the forward rendering Technique of any used Effect
- requires: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+ matchAll: [ Annotation { name: "renderingStyle"; value: "forward" } ]
RenderSurfaceSelector {
id: surfaceSelector
diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
index 95dc51ac2..1be58c557 100644
--- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml
+++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
@@ -64,7 +64,7 @@ FrameGraph {
clearColor: Qt.rgba(0.0, 0.0, 0.0, 1.0)
TechniqueFilter {
- requires: [ Annotation { name: "name"; value: "Desktop" } ]
+ matchAll: [ Annotation { name: "name"; value: "Desktop" } ]
RenderPassFilter {
diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml
index ed5a92685..9fe5032a3 100644
--- a/examples/qt3d/playground-qml/MyForwardRenderer.qml
+++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml
@@ -68,7 +68,7 @@ TechniqueFilter {
property alias layerFilters: layerFilter.layers
property alias clearColor: viewport.clearColor
- requires : [
+ matchAll : [
Annotation { name: "RenderingStyle"; value: "forward";},
Annotation { name: "Enabled"; value: true;}
]
diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml
index 32753e655..e7f6db824 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
- requires: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+ matchAll: [ Annotation { name: "renderingStyle"; value: "forward" } ]
RenderSurfaceSelector {
id: surfaceSelector