From be4127d6f747742c714914e1b313186422b438f3 Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@qt.io>
Date: Tue, 9 Feb 2021 19:01:03 +0100
Subject: 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>
---
 tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests')

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);
     }
 }
 
-- 
cgit v1.2.3