diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-02 11:23:35 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-02 11:24:35 (GMT) |
| commit | 0fc84aa48ef03c1910dc344e204e7267470305c4 (patch) | |
| tree | 675f5f04ceb03d6a71da2aeb92715da7a1527de6 | |
| parent | 7644a925dab5400280228cd2f7381030368c6913 (diff) | |
| download | Qt-0fc84aa48ef03c1910dc344e204e7267470305c4.zip Qt-0fc84aa48ef03c1910dc344e204e7267470305c4.tar.gz Qt-0fc84aa48ef03c1910dc344e204e7267470305c4.tar.bz2 | |
Fix failing bypassShaping autotest on the Mac OS X
This test relies on integer metrics, so we need to force them for Mac OS X.
Reviewed-by: Jocelyn Turcotte
| -rw-r--r-- | tests/auto/qfontmetrics/tst_qfontmetrics.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp index 81e064e..2567a41 100644 --- a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp @@ -223,6 +223,7 @@ void tst_QFontMetrics::averageCharWidth() void tst_QFontMetrics::bypassShaping() { QFont f; + f.setStyleStrategy(QFont::ForceIntegerMetrics); QFontMetrics fm(f); QString text = " A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z"; int textWidth = fm.width(text, -1, Qt::TextBypassShaping); |