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/qquickpincharea | |
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/qquickpincharea')
3 files changed, 3 insertions, 3 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 diff --git a/tests/auto/quick/qquickpincharea/data/transformedPinchArea.qml b/tests/auto/quick/qquickpincharea/data/transformedPinchArea.qml index 7d5d88a5bd..292838ed2a 100644 --- a/tests/auto/quick/qquickpincharea/data/transformedPinchArea.qml +++ b/tests/auto/quick/qquickpincharea/data/transformedPinchArea.qml @@ -24,7 +24,7 @@ Rectangle { property bool pinching: false pinch.target: rect - pinch.dragAxis: Drag.XandYAxis + pinch.dragAxis: Drag.XAndYAxis onPinchStarted: pinching = true onPinchFinished: pinching = false } diff --git a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp index b3147067b0..4ba9e50c26 100644 --- a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp +++ b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp @@ -108,7 +108,7 @@ void tst_QQuickPinchArea::pinchProperties() QCOMPARE(targetSpy.count(),1); // axis - QCOMPARE(pinch->axis(), QQuickPinch::XandYAxis); + QCOMPARE(pinch->axis(), QQuickPinch::XAndYAxis); QSignalSpy axisSpy(pinch, SIGNAL(dragAxisChanged())); pinch->setAxis(QQuickPinch::XAxis); QCOMPARE(pinch->axis(), QQuickPinch::XAxis); |