summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2021-02-09 19:01:03 +0100
committerEirik Aavitsland <eirik.aavitsland@qt.io>2021-02-10 21:17:09 +0100
commitbe4127d6f747742c714914e1b313186422b438f3 (patch)
treeb2bfcbd7b2d7f8f6be1eab884a44f63f2b91c019 /tests
parente6bd5a5ca3f55765edccf7c667612fb0919e6c94 (diff)
Fix recently added auto test of text layout overflow
Ignore width of trailing space. Pick-to: 6.1 6.0 5.15 Fixes: QTBUG-91038 Change-Id: I74e278366a2c3b170335738bf6d6ee23933b361a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index 2d99ef03aa..099ccab51c 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -1907,7 +1907,8 @@ void tst_QTextLayout::longText()
break;
}
layout.endLayout();
- QVERIFY(layout.maximumWidth() <= QFIXED_MAX);
+ QFontMetricsF fm(layout.font());
+ QVERIFY(layout.maximumWidth() - fm.horizontalAdvance(' ') <= QFIXED_MAX);
}
}