From 65df0d15038a89810567662644089a197bb8016b Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 8 Jun 2009 14:08:43 +0200 Subject: don't reset the touch widget in the basicRawEventTranslation() test --- tests/auto/qtouchevent/tst_qtouchevent.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tests/auto/qtouchevent') diff --git a/tests/auto/qtouchevent/tst_qtouchevent.cpp b/tests/auto/qtouchevent/tst_qtouchevent.cpp index 0a96edad6a..ae6e2179c2 100644 --- a/tests/auto/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/qtouchevent/tst_qtouchevent.cpp @@ -278,12 +278,11 @@ void tst_QTouchEvent::basicRawEventTranslation() QCOMPARE(touchBeginPoint.pressure(), qreal(-1.)); // moving the point should translate to TouchUpdate - touchWidget.reset(); rawTouchPoint.setState(Qt::TouchPointMoved); rawTouchPoint.setGlobalPos(globalPos + delta); res = qt_translateRawTouchEvent(QList() << rawTouchPoint, &touchWidget); QVERIFY(res); - QVERIFY(!touchWidget.seenTouchBegin); + QVERIFY(touchWidget.seenTouchBegin); QVERIFY(touchWidget.seenTouchUpdate); QVERIFY(!touchWidget.seenTouchEnd); QCOMPARE(touchWidget.touchUpdatePoints.count(), 1); @@ -300,13 +299,12 @@ void tst_QTouchEvent::basicRawEventTranslation() QCOMPARE(touchUpdatePoint.pressure(), qreal(-1.)); // releasing the point translates to TouchEnd - touchWidget.reset(); rawTouchPoint.setState(Qt::TouchPointReleased); rawTouchPoint.setGlobalPos(globalPos + delta + delta); res = qt_translateRawTouchEvent(QList() << rawTouchPoint, &touchWidget); QVERIFY(res); - QVERIFY(!touchWidget.seenTouchBegin); - QVERIFY(!touchWidget.seenTouchUpdate); + QVERIFY(touchWidget.seenTouchBegin); + QVERIFY(touchWidget.seenTouchUpdate); QVERIFY(touchWidget.seenTouchEnd); QCOMPARE(touchWidget.touchEndPoints.count(), 1); QTouchEvent::TouchPoint touchEndPoint = touchWidget.touchEndPoints.first(); -- cgit v1.2.3