diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-01 09:23:51 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-01 09:23:51 (GMT) |
| commit | ee767e8c16742316068e83323374ea54f2b939cb (patch) | |
| tree | bb3f6c94e6c1512545cd657d2c675a371a6a88f7 /tests/auto/qtextlayout | |
| parent | 54869c8727e5403cea866c99a5f83ae9c8533f82 (diff) | |
| parent | 2653c4fcf42ec93db16a299c29c9fe0f98680c75 (diff) | |
| download | Qt-ee767e8c16742316068e83323374ea54f2b939cb.zip Qt-ee767e8c16742316068e83323374ea54f2b939cb.tar.gz Qt-ee767e8c16742316068e83323374ea54f2b939cb.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/text/qfontengine_mac.mm
src/opengl/qpixmapdata_gl.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/eabi/QtOpenGLu.def
tests/auto/qtextlayout/tst_qtextlayout.cpp
Diffstat (limited to 'tests/auto/qtextlayout')
| -rw-r--r-- | tests/auto/qtextlayout/tst_qtextlayout.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp index d1b615e..0a14e4a 100644 --- a/tests/auto/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp @@ -124,8 +124,8 @@ private slots: void testLineBreakingAllSpaces(); void lineWidthFromBOM(); void textWidthVsWIdth(); - void textWithSurrogates_qtbug15679(); + void textWidthWithStackedTextEngine(); private: QFont testFont; @@ -1432,5 +1432,16 @@ void tst_QTextLayout::textWithSurrogates_qtbug15679() QCOMPARE(x[2] - x[0], x[5] - x[3]); } +void tst_QTextLayout::textWidthWithStackedTextEngine() +{ + QString text = QString::fromUtf8("คลิก ถัดไป เพื่อดำเนินการต่อ"); + QTextLayout layout(text); + layout.beginLayout(); + QTextLine line = layout.createLine(); + layout.endLayout(); + QFontMetricsF fm(layout.font()); + QCOMPARE(line.naturalTextWidth(), fm.width(text)); +} + QTEST_MAIN(tst_QTextLayout) #include "tst_qtextlayout.moc" |