diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2021-09-28 17:00:59 +0200 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2021-10-04 16:10:11 +0200 |
| commit | ae10084ef9d9db5f32cc9d42ab7e485d0a896d78 (patch) | |
| tree | 4b7d2ac4c162669c5466c8f6481710724393d27c /src/gui/text/qfontdatabase.cpp | |
| parent | c89c14561671aa2ef2e5f7f35b26d8bce59ad77f (diff) | |
Respect font stretch if set together with font style
Fixes: QTBUG-77854
Change-Id: I2bf9cea9d5ecd151a9d96bbe93e9477a9159ca1f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 9cb9155a50..ae6250a3f5 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -783,7 +783,7 @@ QFontEngine *loadSingleEngine(int script, if (style->key.stretch != 0 && request.stretch != 0 && (request.styleName.isEmpty() || request.styleName != style->styleName)) { def.stretch = (request.stretch * 100 + style->key.stretch / 2) / style->key.stretch; - } else { + } else if (request.stretch == QFont::AnyStretch) { def.stretch = 100; } |