diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2021-10-11 11:13:57 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-11 15:26:36 +0000 |
| commit | 313ed1613a43b122689cb147c4d995966707690e (patch) | |
| tree | ed8d61d84861a0b125b549289db146b38e8051b3 | |
| parent | 65de4d17d82a490c8b245475ecf2e3df2b95703c (diff) | |
| download | qtsvg-313ed1613a43b122689cb147c4d995966707690e.tar.gz | |
Support font size not in pixels
Fixes: QTBUG-97422
Change-Id: I4df2af0e657f241af69480e6e30d454870df51d8
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit 4531aad935d55924a32212b339c657ce363a6c08)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/svg/qsvghandler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 8a16568..e6f304f 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -1363,9 +1363,10 @@ static void parseFont(QSvgNode *node, case FontSizeNone: break; case FontSizeValue: { - QSvgHandler::LengthType dummy; // should always be pixel size - fontStyle->setSize(qMin(parseLength(attributes.fontSize, dummy, handler), - qreal(0xffff))); + QSvgHandler::LengthType type; + qreal fs = parseLength(attributes.fontSize, type, handler); + fs = convertToPixels(fs, true, type); + fontStyle->setSize(qMin(fs, qreal(0xffff))); } break; default: |