diff options
Diffstat (limited to 'tests/auto')
8 files changed, 9 insertions, 9 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 diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp index 3c89ad4908..d6b501c619 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -150,7 +150,7 @@ void tst_QQuickMouseArea::dragProperties() QCOMPARE(targetSpy.count(),1); // axis - QCOMPARE(drag->axis(), QQuickDrag::XandYAxis); + QCOMPARE(drag->axis(), QQuickDrag::XAndYAxis); QSignalSpy axisSpy(drag, SIGNAL(axisChanged())); drag->setAxis(QQuickDrag::XAxis); QCOMPARE(drag->axis(), QQuickDrag::XAxis); @@ -1344,7 +1344,7 @@ void tst_QQuickMouseArea::changeAxis() QTRY_VERIFY(drag->active()); QCOMPARE(blackRect->x(), 72.0); QCOMPARE(blackRect->y(), 72.0); - QCOMPARE(drag->axis(), QQuickDrag::XandYAxis); + QCOMPARE(drag->axis(), QQuickDrag::XAndYAxis); /* When blackRect.x becomes bigger than 75, the drag axis is changed to * Drag.YAxis by the QML code. Verify that this happens, and that the drag 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); |