aboutsummaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-03-01 20:09:52 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-15 22:59:32 +0100
commitb5b46f398c1a04ab443bf22ec08c5efbf72c161e (patch)
treeb7e85e2a81a06719ffc28bc5042c98582557209c /tests/manual
parent585bce863f4dd4b169111b2af11e50ba9fece92a (diff)
Add a hidden XandYAxis enum value
For Qt 5 XandYAxis is being renamed to XAndYAxis to more consistently follow capitalization rules. Add an undocumented XandYAxis variable to ease porting. Change-Id: Id9e41dd5578373f5f557937da889a9326ff12e53 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/scenegraph_lancelot/data/images/transform.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/scenegraph_lancelot/data/images/transform.qml b/tests/manual/scenegraph_lancelot/data/images/transform.qml
index be711ba80f..5a02724585 100644
--- a/tests/manual/scenegraph_lancelot/data/images/transform.qml
+++ b/tests/manual/scenegraph_lancelot/data/images/transform.qml
@@ -24,7 +24,7 @@ Rectangle {
MouseArea {
anchors.fill: parent
drag.target: parent
- drag.axis: Drag.XandYAxis
+ drag.axis: Drag.XAndYAxis
drag.minimumX: 0
drag.maximumX: wooohooo.width - parent.width
drag.minimumY: 0
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
index 46fa6f5583..e2a3ca7a0c 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
@@ -44,7 +44,7 @@ Item {
MouseArea {
anchors.fill: parent
drag.target: parent
- drag.axis: Drag.XandYAxis
+ drag.axis: Drag.XAndYAxis
drag.minimumX: 0
drag.maximumX: parent.parent.width - width
drag.minimumY: 0