summaryrefslogtreecommitdiffstats
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-24 17:42:08 +0100
commit723077eb3529810aa3b99d8c06f9b81a586763c9 (patch)
treecff7c162692efe1cd7a8e802fae2c98c370411f0
parentd0dbb79363858bfabc4b7798f821e351b7306bfb (diff)
Fix recently added auto test of text layout overflowv6.0.2
Ignore width of trailing space. Fixes: QTBUG-91038 Change-Id: I74e278366a2c3b170335738bf6d6ee23933b361a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit be4127d6f747742c714914e1b313186422b438f3) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-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 9726db188a..b605fc75f8 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);
}
}