From 0f36211f84d8cf7d478c844ff48d1b618f7ae24f Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 30 Dec 2011 16:39:17 +1000 Subject: Simplify MultiPointTouchArea signal names. Change-Id: I0617bf7138b76495c111739e2cbdf3b77c4b6a5d Reviewed-by: Joona Petrell --- tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml | 2 +- tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/qtquick2/qquickmultipointtoucharea') diff --git a/tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml index 5db377011c..9c9132d0b0 100644 --- a/tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml @@ -24,7 +24,7 @@ Flickable { TouchPoint { id: point2; objectName: "point2" } ] - onTouchPointsCanceled: cancelCount = touchPoints.length + onCanceled: cancelCount = touchPoints.length onTouchUpdated: touchCount = touchPoints.length } } diff --git a/tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml index 85f8cd6f39..54b160c182 100644 --- a/tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml @@ -20,9 +20,9 @@ MultiPointTouchArea { maximumTouchPoints: 5 - onTouchPointsPressed: { touchPointPressCount = touchPoints.length } - onTouchPointsUpdated: { touchPointUpdateCount = touchPoints.length } - onTouchPointsReleased: { touchPointReleaseCount = touchPoints.length } + onPressed: { touchPointPressCount = touchPoints.length } + onUpdated: { touchPointUpdateCount = touchPoints.length } + onReleased: { touchPointReleaseCount = touchPoints.length } onTouchUpdated: { touchCount = touchPoints.length touchUpdatedHandled = true -- cgit v1.2.3