aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraavit <eirik.aavitsland@digia.com>2012-10-29 12:14:55 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-29 13:45:18 +0100
commitacebe1738e6598e6653673bf4adf61b1cb1e0911 (patch)
tree22a15072c36e9677a0293c390370ea4726fb982b
parent0baccec7b4c3a7487dc6ca7c3d6b71130b916efc (diff)
Update qml test scenes with new property names
Change-Id: I67953f257f8948f3ec821cf3e5bc4763aff8d1aa Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
-rw-r--r--tests/manual/scenegraph_lancelot/data/rectangles/test-rectangles.qml4
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml2
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/manual/scenegraph_lancelot/data/rectangles/test-rectangles.qml b/tests/manual/scenegraph_lancelot/data/rectangles/test-rectangles.qml
index b2dcf4e675..0eb0a37de8 100644
--- a/tests/manual/scenegraph_lancelot/data/rectangles/test-rectangles.qml
+++ b/tests/manual/scenegraph_lancelot/data/rectangles/test-rectangles.qml
@@ -42,7 +42,7 @@ Rectangle {
anchors.fill: parent
anchors.margins: 10
radius: index * 20
- border.aligned: local._index == 1
+ border.pixelAligned: local._index == 1
border.width: local._index == 0 ? 0 : 0.5
opacity: 0.5
color: "steelBlue"
@@ -58,7 +58,7 @@ Rectangle {
anchors.fill: parent
anchors.margins: 10
radius: index * 20
- border.aligned: local._index == 1
+ border.pixelAligned: local._index == 1
border.width: local._index == 0 ? 0 : 0.5
opacity: 0.5
gradient: Gradient {
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml
index 47687918e0..76ce60fd7d 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml
@@ -69,7 +69,7 @@ Rectangle {
anchors.margins: 10
width: 200
height: 100
- culling: model.bar
+ cullMode: model.bar
property variant frontSource: front
property variant backSource: back
fragmentShader: "
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml
index a6fcc260cd..45f20dd5a4 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml
@@ -69,7 +69,7 @@ Rectangle {
anchors.margins: 10
width: 200
height: 100
- culling: model.bar
+ cullMode: model.bar
property variant frontSource: front
property variant backSource: back
fragmentShader: "