diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
| commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
| tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /tests/auto/gui/text/qfontmetrics | |
| parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
| parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/gui/text/qfontmetrics')
| -rw-r--r-- | tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp index f155e820ec..cddec5b6e7 100644 --- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp @@ -228,7 +228,7 @@ void tst_QFontMetrics::bypassShaping() int charsWidth = 0; for (int i = 0; i < text.size(); ++i) charsWidth += fm.width(text[i]); - // This assertion is needed in QtWebKit's WebCore::Font::offsetForPositionForSimpleText + // This assertion is needed in Qt WebKit's WebCore::Font::offsetForPositionForSimpleText QCOMPARE(textWidth, charsWidth); } |