diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-22 13:33:13 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-25 00:09:14 +0200 |
| commit | 874cff299cc1c8520cd2dc72b4f106da666d4b5f (patch) | |
| tree | d4ced8b6cfa7068b2ead88efde7622bdd9ac54ee /examples | |
| parent | 51de622f32306b72052af04d471726ea2e8b0d78 (diff) | |
Examples updates to use new QTechniqueCriterion syntax
Change-Id: I871be19f417a2ac1dae531c4c2807bda7e59c8e8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/bigmodel-qml/ForwardRenderer.qml | 2 | ||||
| -rw-r--r-- | examples/rollerball/AdsEffect.qml | 5 | ||||
| -rw-r--r-- | examples/rollerball/ForwardRenderer.qml | 5 | ||||
| -rw-r--r-- | examples/simple-qml/ForwardRenderer.qml | 2 | ||||
| -rw-r--r-- | examples/simple-qml/main.qml | 4 | ||||
| -rw-r--r-- | examples/torus-qml/ForwardRenderer.qml | 2 |
6 files changed, 7 insertions, 13 deletions
diff --git a/examples/bigmodel-qml/ForwardRenderer.qml b/examples/bigmodel-qml/ForwardRenderer.qml index 1ea9b95c7..62d6e3e0d 100644 --- a/examples/bigmodel-qml/ForwardRenderer.qml +++ b/examples/bigmodel-qml/ForwardRenderer.qml @@ -56,7 +56,7 @@ TechniqueFilter { property alias camera: cameraSelector.camera criteria : [ - TechniqueCriterion { criterionType : TechniqueCriterion.RenderingStyle; criterionValue : "forward"} + TechniqueCriterion { name : "RenderingStyle"; value : "forward"} ] Viewport { diff --git a/examples/rollerball/AdsEffect.qml b/examples/rollerball/AdsEffect.qml index c1806e7b7..6f196e5d8 100644 --- a/examples/rollerball/AdsEffect.qml +++ b/examples/rollerball/AdsEffect.qml @@ -70,10 +70,7 @@ Effect { techniques: [ Technique { criteria : [ - TechniqueCriterion { - criterionType: TechniqueCriterion.RenderingStyle - criterionValue : "forward" - } + TechniqueCriterion { name : "RenderingStyle"; value : "forward"} ] parameters : [ diff --git a/examples/rollerball/ForwardRenderer.qml b/examples/rollerball/ForwardRenderer.qml index 6ab3107e1..93804bff9 100644 --- a/examples/rollerball/ForwardRenderer.qml +++ b/examples/rollerball/ForwardRenderer.qml @@ -51,10 +51,7 @@ TechniqueFilter { // Select the forward rendering Technique of any used Effect criteria : [ - TechniqueCriterion { - criterionType: TechniqueCriterion.RenderingStyle; - criterionValue : "forward" - } + TechniqueCriterion { name : "RenderingStyle"; value : "forward"} ] // Use the whole viewport diff --git a/examples/simple-qml/ForwardRenderer.qml b/examples/simple-qml/ForwardRenderer.qml index aba8d0404..cb9ec615d 100644 --- a/examples/simple-qml/ForwardRenderer.qml +++ b/examples/simple-qml/ForwardRenderer.qml @@ -60,7 +60,7 @@ TechniqueFilter { property alias layerFilters : layerFilter.layers criteria : [ - TechniqueCriterion { criterionType : TechniqueCriterion.RenderingStyle; criterionValue : "forward"} + TechniqueCriterion { name : "RenderingStyle"; value : "forward"} ] Viewport { diff --git a/examples/simple-qml/main.qml b/examples/simple-qml/main.qml index b5ba6b8dc..5faeab30d 100644 --- a/examples/simple-qml/main.qml +++ b/examples/simple-qml/main.qml @@ -266,7 +266,7 @@ Entity { effect : Effect { techniques : [ Technique { - criteria : [TechniqueCriterion { criterionType : TechniqueCriterion.RenderingStyle; criterionValue : "forward"}] + criteria : [TechniqueCriterion { name : "RenderingStyle"; value : "forward"}] openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 } renderPasses : [ RenderPass { @@ -347,7 +347,7 @@ Entity { techniques : [ Technique { openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 } - criteria : [TechniqueCriterion { criterionType : TechniqueCriterion.RenderingStyle; criterionValue : "forward"}] + criteria : [TechniqueCriterion { name : "RenderingStyle"; value : "forward"}] parameters : [Parameter { name : "lightPos"; value : Qt.vector4d(10.0, 10.0, 0.0, 1.0);}] diff --git a/examples/torus-qml/ForwardRenderer.qml b/examples/torus-qml/ForwardRenderer.qml index 1ea9b95c7..62d6e3e0d 100644 --- a/examples/torus-qml/ForwardRenderer.qml +++ b/examples/torus-qml/ForwardRenderer.qml @@ -56,7 +56,7 @@ TechniqueFilter { property alias camera: cameraSelector.camera criteria : [ - TechniqueCriterion { criterionType : TechniqueCriterion.RenderingStyle; criterionValue : "forward"} + TechniqueCriterion { name : "RenderingStyle"; value : "forward"} ] Viewport { |