diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-06-03 11:25:03 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-06-08 15:04:19 +0200 |
| commit | 078c3b7d686c3dfb584f5df57b5ed5c4cb624592 (patch) | |
| tree | 2777bfb727a790405f36204f09b35dc913fb2e58 /tests/auto | |
| parent | 18e8519dcdf36b211b39c131c0d6e08b5921a03c (diff) | |
Remove deprecated text-related enums
Fixes: QTBUG-82367
Change-Id: Iff2645759657f8e350754e90e791dbd583017671
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/gui/text/qfont/tst_qfont.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp | 17 |
2 files changed, 6 insertions, 13 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index 0217c04788..eb9d83c525 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -109,8 +109,6 @@ void tst_QFont::getSetCheck() QCOMPARE(QFont::StyleStrategy(QFont::PreferAntialias), obj1.styleStrategy()); obj1.setStyleStrategy(QFont::StyleStrategy(QFont::NoAntialias)); QCOMPARE(QFont::StyleStrategy(QFont::NoAntialias), obj1.styleStrategy()); - obj1.setStyleStrategy(QFont::StyleStrategy(QFont::OpenGLCompatible)); - QCOMPARE(QFont::StyleStrategy(QFont::OpenGLCompatible), obj1.styleStrategy()); } void tst_QFont::exactMatch() diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp index 6fe3e20083..e1db231a20 100644 --- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp @@ -47,11 +47,7 @@ private slots: void elidedText(); void veryNarrowElidedText(); void averageCharWidth(); - -#if QT_DEPRECATED_SINCE(5, 11) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void bypassShaping(); -#endif - void elidedMultiLength(); void elidedMultiLengthF(); void inFontUcs4(); @@ -193,22 +189,21 @@ void tst_QFontMetrics::averageCharWidth() QVERIFY(fmf.averageCharWidth() != 0); } -#if QT_DEPRECATED_SINCE(5, 11) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void tst_QFontMetrics::bypassShaping() { QFont f; - f.setStyleStrategy(QFont::ForceIntegerMetrics); - QFontMetrics fm(f); + f.setStyleStrategy(QFont::PreferNoShaping); + f.setKerning(false); + + QFontMetricsF 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); + qreal textWidth = fm.horizontalAdvance(text); QVERIFY(textWidth != 0); - int charsWidth = 0; + qreal charsWidth = 0; for (int i = 0; i < text.size(); ++i) charsWidth += fm.horizontalAdvance(text[i]); - // This assertion is needed in Qt WebKit's WebCore::Font::offsetForPositionForSimpleText QCOMPARE(textWidth, charsWidth); } -#endif template<class FontMetrics, typename PrimitiveType> void elidedMultiLength_helper() { |