diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-02-01 03:09:44 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-02-01 03:09:44 (GMT) |
| commit | 88b072b3644cfd960367096ae0103e8ddef0d06d (patch) | |
| tree | b3628c5e6d89d0827714140c59928118804d8d91 /tests/auto/declarative | |
| parent | ce87671e0143e3e665c076974482f3ae50850058 (diff) | |
| download | Qt-88b072b3644cfd960367096ae0103e8ddef0d06d.zip Qt-88b072b3644cfd960367096ae0103e8ddef0d06d.tar.gz Qt-88b072b3644cfd960367096ae0103e8ddef0d06d.tar.bz2 | |
PinchArea sometimes failed.
Almost always failed on Mac and could fail on other systems due to
QDeclarativePinchEvent::m_accepted not being initialized.
Task-number: QTBUG-15491
Reviewed-by: Bea Lam
Diffstat (limited to 'tests/auto/declarative')
| -rw-r--r-- | tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp index b7e7a99..f175033 100644 --- a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp +++ b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp @@ -228,14 +228,8 @@ void tst_QDeclarativePinchArea::scale() p2 += QPoint(10,10); QTest::touchEvent(vp).move(0, p1).move(1, p2); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "todo on mac", Continue); -#endif QCOMPARE(root->property("scale").toReal(), 1.5); QCOMPARE(root->property("center").toPointF(), QPointF(40, 40)); // blackrect is at 50,50 -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "todo on mac", Continue); -#endif QCOMPARE(blackRect->scale(), 1.5); // scale beyond bound @@ -243,9 +237,6 @@ void tst_QDeclarativePinchArea::scale() p2 += QPoint(50,50); QTest::touchEvent(vp).move(0, p1).move(1, p2); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "todo on mac", Continue); -#endif QCOMPARE(blackRect->scale(), 2.0); QTest::touchEvent(vp).release(0, p1).release(1, p2); @@ -292,18 +283,9 @@ void tst_QDeclarativePinchArea::pan() p2 += QPoint(10,10); QTest::touchEvent(vp).move(0, p1).move(1, p2); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "todo mac", Continue); -#endif QCOMPARE(root->property("center").toPointF(), QPointF(60, 60)); // blackrect is at 50,50 -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "todo mac", Continue); -#endif QCOMPARE(blackRect->x(), 60.0); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "todo mac", Continue); -#endif QCOMPARE(blackRect->y(), 60.0); // pan x beyond bound @@ -311,13 +293,7 @@ void tst_QDeclarativePinchArea::pan() p2 += QPoint(100,100); QTest::touchEvent(vp).move(0, p1).move(1, p2); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "todo mac", Continue); -#endif QCOMPARE(blackRect->x(), 140.0); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "todo mac", Continue); -#endif QCOMPARE(blackRect->y(), 160.0); QTest::touchEvent(vp).release(0, p1).release(1, p2); |