Marked expected failures in tst_qtextlayout on Windows

Task-number: QTBUG-25924
Change-Id: I24a8ab6a695bf76f19e9082e1d8b11d8ec03fc4f
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index 3a1cd48..d20fe83 100644 (file)
--- 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();