aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickpincharea/data/pinchproperties.qml
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/auto/quick/qquickpincharea/data/pinchproperties.qml
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/auto/quick/qquickpincharea/data/pinchproperties.qml')
-rw-r--r--tests/auto/quick/qquickpincharea/data/pinchproperties.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickpincharea/data/pinchproperties.qml b/tests/auto/quick/qquickpincharea/data/pinchproperties.qml
index 6665e2f597..37d706fc8e 100644
--- a/tests/auto/quick/qquickpincharea/data/pinchproperties.qml
+++ b/tests/auto/quick/qquickpincharea/data/pinchproperties.qml
@@ -22,7 +22,7 @@ Rectangle {
objectName: "pincharea"
anchors.fill: parent
pinch.target: blackRect
- pinch.dragAxis: Drag.XandYAxis
+ pinch.dragAxis: Drag.XAndYAxis
pinch.minimumX: 0
pinch.maximumX: whiteRect.width-blackRect.width
pinch.minimumY: 0