summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-06-01 13:54:08 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-01 16:12:03 +0200
commit79a025b88a382b994febb4943292fdc15b0e55b3 (patch)
tree87bc4d621b26bcb8b8fdac89bf60585d00a174ec /tests/auto/gui
parent37db43f1c2515002c4ab4493a954d3e8fdd20363 (diff)
Marked expected failures in tst_qtextlayout on Windows
Task-number: QTBUG-25924 Change-Id: I24a8ab6a695bf76f19e9082e1d8b11d8ec03fc4f Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index 3a1cd48bef..d20fe83f2f 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -957,7 +957,21 @@ void tst_QTextLayout::horizontalAlignmentMultiline()
qDebug() << firstLine.textLength() << firstLine.naturalTextRect() << lastLine.naturalTextRect();
QRectF rect = firstLine.naturalTextRect();
+
+#ifdef Q_OS_WIN
+ QEXPECT_FAIL("ltr linebreak ralign", "QTBUG-25924 fails on Windows", Abort);
+ QEXPECT_FAIL("ltr linebreak calign", "QTBUG-25924 fails on Windows", Abort);
+ QEXPECT_FAIL("rtl linebreak ralign", "QTBUG-25924 fails on Windows", Abort);
+ QEXPECT_FAIL("rtl linebreak calign", "QTBUG-25924 fails on Windows", Abort);
+#endif
+
QCOMPARE(rect.left(), firstLeft);
+
+#ifdef Q_OS_WIN
+ QEXPECT_FAIL("ltr linebreak lalign", "QTBUG-25924 fails on Windows", Abort);
+ QEXPECT_FAIL("rtl linebreak lalign", "QTBUG-25924 fails on Windows", Abort);
+#endif
+
QCOMPARE(rect.right(), firstRight);
rect = lastLine.naturalTextRect();