diff options
Diffstat (limited to 'src/gui/text/qfontmetrics.cpp')
-rw-r--r-- | src/gui/text/qfontmetrics.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index 8067969f56..5675d6921d 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -541,6 +541,7 @@ int QFontMetrics::width(const QString &text, int len, int flags) const if (len == 0) return 0; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) if (flags & Qt::TextBypassShaping) { // Skip complex shaping, only use advances int numGlyphs = len; @@ -554,6 +555,7 @@ int QFontMetrics::width(const QString &text, int len, int flags) const width += glyphs.advances[i]; return qRound(width); } +#endif QStackTextEngine layout(text, QFont(d.data())); return qRound(layout.width(0, len)); |