diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-03 17:01:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 20:57:23 +0200 |
| commit | c9c3875fd091602c5470cd45a995dbb329d8cf3d (patch) | |
| tree | 4dba1226ef3c13db8f56f970d6723f704decd240 /tests | |
| parent | 43663bc87daed85a3da7f2cfcbea26a5f1ead8dd (diff) | |
Remove Unicode escape sequence, which MSVC does not support.
Task-number: QTBUG-25924
Change-Id: I352bb5c674d90891df4103849bf5b5ac5778a2ee
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp index 21098f4036..ab87ad0dfb 100644 --- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp @@ -819,7 +819,7 @@ void tst_QTextLayout::horizontalAlignmentMultiline_data() { qreal width = TESTFONT_SIZE * 8; - QString linebreakText("^%$&\u2028^%&*^$"); + const QString linebreakText = QStringLiteral("^%$&") + QChar(0x2028) + QStringLiteral("^%&*^$"); QString wrappingText("^%$&^%&*^$"); QString wrappingWhitespaceText("^%$& ^%&*^$"); @@ -956,21 +956,7 @@ 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(); |