From e4f8bfd303e84fcd6363d0c1974ce70944d1e9d9 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Thu, 17 May 2012 09:35:34 +1000 Subject: [PATCH] Skip failing test. Fix in qtbase can't be merged until the QEXPECT_FAIL's are removed. Change-Id: Id416627cce3074549eda13331b7a88cc0313a910 Reviewed-by: Yann Bodson --- tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index 5397b6c..3367d22 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -2684,7 +2684,7 @@ void tst_qquicktextinput::cursorRectangle_data() void tst_qquicktextinput::cursorRectangle() { - + QSKIP("QTBUG-24801"); QFETCH(QString, text); QFETCH(int, positionAtWidth); QFETCH(int, wrapPosition); @@ -2756,8 +2756,6 @@ void tst_qquicktextinput::cursorRectangle() input.setCursorPosition(i); r = input.cursorRectangle(); - if (i > positionAtWidth) - QEXPECT_FAIL("right to left", "QTBUG-24801", Continue); QCOMPARE(r.left(), line.cursorToX(i, QTextLine::Leading) - offset); QCOMPARE(r.top(), 0.); QCOMPARE(input.inputMethodQuery(Qt::ImCursorRectangle).toRectF(), r); @@ -2835,7 +2833,6 @@ void tst_qquicktextinput::cursorRectangle() input.setCursorPosition(wrapPosition - 1); r = input.cursorRectangle(); QCOMPARE(r.top(), 0.); - QEXPECT_FAIL("right to left", "QTBUG-24801", Continue); QCOMPARE(r.left(), leftToRight ? input.width() : 0); QCOMPARE(input.inputMethodQuery(Qt::ImCursorRectangle).toRectF(), r); QCOMPARE(input.positionToRectangle(10), r); -- 2.7.4