diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-03-01 20:09:52 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-15 22:59:32 +0100 |
| commit | b5b46f398c1a04ab443bf22ec08c5efbf72c161e (patch) | |
| tree | b7e85e2a81a06719ffc28bc5042c98582557209c /tests/auto/quick/qquickmousearea/data | |
| parent | 585bce863f4dd4b169111b2af11e50ba9fece92a (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/qquickmousearea/data')
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickmousearea/data/changeAxis.qml b/tests/auto/quick/qquickmousearea/data/changeAxis.qml index cf791df31d..4463f467a2 100644 --- a/tests/auto/quick/qquickmousearea/data/changeAxis.qml +++ b/tests/auto/quick/qquickmousearea/data/changeAxis.qml @@ -16,7 +16,7 @@ Rectangle { objectName: "mouseregion" anchors.fill: parent drag.target: blackRect - drag.axis: blackRect.x <= 75 ? Drag.XandYAxis : Drag.YAxis + drag.axis: blackRect.x <= 75 ? Drag.XAndYAxis : Drag.YAxis } } } diff --git a/tests/auto/quick/qquickmousearea/data/dragging.qml b/tests/auto/quick/qquickmousearea/data/dragging.qml index d9b6ac4083..4e0dbe6277 100644 --- a/tests/auto/quick/qquickmousearea/data/dragging.qml +++ b/tests/auto/quick/qquickmousearea/data/dragging.qml @@ -18,7 +18,7 @@ Rectangle { objectName: "mouseregion" anchors.fill: parent drag.target: blackRect - drag.axis: Drag.XandYAxis + drag.axis: Drag.XAndYAxis drag.minimumX: 0 drag.maximumX: whiteRect.width-blackRect.width drag.minimumY: 0 diff --git a/tests/auto/quick/qquickmousearea/data/dragproperties.qml b/tests/auto/quick/qquickmousearea/data/dragproperties.qml index 421dfe26b7..d8d7b3bb6e 100644 --- a/tests/auto/quick/qquickmousearea/data/dragproperties.qml +++ b/tests/auto/quick/qquickmousearea/data/dragproperties.qml @@ -18,7 +18,7 @@ Rectangle { objectName: "mouseregion" anchors.fill: parent drag.target: blackRect - drag.axis: Drag.XandYAxis + drag.axis: Drag.XAndYAxis drag.minimumX: 0 drag.maximumX: whiteRect.width-blackRect.width drag.minimumY: 0 diff --git a/tests/auto/quick/qquickmousearea/data/dragreset.qml b/tests/auto/quick/qquickmousearea/data/dragreset.qml index d7949f9139..3259dcf87d 100644 --- a/tests/auto/quick/qquickmousearea/data/dragreset.qml +++ b/tests/auto/quick/qquickmousearea/data/dragreset.qml @@ -18,7 +18,7 @@ Rectangle { objectName: "mouseregion" anchors.fill: parent drag.target: haveTarget ? blackRect : undefined - drag.axis: Drag.XandYAxis + drag.axis: Drag.XAndYAxis drag.minimumX: 0 drag.maximumX: whiteRect.width-blackRect.width drag.minimumY: 0 |