summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-04-01 08:01:36 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-04-01 08:01:36 (GMT)
commit1c3fa677ee494f8982c99b468b4a4fcad8aa04c7 (patch)
tree47fad4bd35a1f4c9ce8d2e6faa13e888a6907b7a /tests/auto
parent37feac98c573a099502fddfb5703c2359711b4c4 (diff)
downloadQt-1c3fa677ee494f8982c99b468b4a4fcad8aa04c7.zip
Qt-1c3fa677ee494f8982c99b468b4a4fcad8aa04c7.tar.gz
Qt-1c3fa677ee494f8982c99b468b4a4fcad8aa04c7.tar.bz2
Remove duplicated test.
it appeared in the merge of 4.7 and master, because the fix was backported.
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qtextlayout/tst_qtextlayout.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp
index 9f79420..83c7094 100644
--- a/tests/auto/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp
@@ -127,7 +127,6 @@ private slots:
void textWithSurrogates_qtbug15679();
void textWidthWithStackedTextEngine();
void textWidthWithLineSeparator();
- void textWithSurrogates_qtbug15679();
private:
QFont testFont;
@@ -1461,24 +1460,5 @@ void tst_QTextLayout::textWidthWithLineSeparator()
QCOMPARE(line1.naturalTextWidth(), line2.naturalTextWidth());
}
-void tst_QTextLayout::textWithSurrogates_qtbug15679()
-{
- QString str = QString::fromUtf8("🀀a🀀");
- QTextLayout layout(str);
- layout.beginLayout();
- QTextLine line = layout.createLine();
- layout.endLayout();
-
- qreal x[6];
- for (int i = 0; i < 6; i++)
- x[i] = line.cursorToX(i);
-
- // If the first and third character are using the same
- // font, they must have the same advance (since they
- // are surrogate pairs, we need to add two for each
- // character)
- QCOMPARE(x[2] - x[0], x[5] - x[3]);
-}
-
QTEST_MAIN(tst_QTextLayout)
#include "tst_qtextlayout.moc"