diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:55:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:55:07 +0100 |
| commit | 2c67415afc2e12bab958e16b18bcab88a537c248 (patch) | |
| tree | 277d0fd9a1cb9ac13ace7c741766807f18542214 /src/svg/qsvghandler.cpp | |
| parent | 8dbfbe633ee7cd1853354830872fc1c60f9e2139 (diff) | |
| parent | 92ae8746c412fbc87a97364eb4d86e470009f80d (diff) | |
| download | qtsvg-2c67415afc2e12bab958e16b18bcab88a537c248.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3
Change-Id: Ic4b8abc44f58b3d5d34cddf2743d0d172df4a374
Diffstat (limited to 'src/svg/qsvghandler.cpp')
| -rw-r--r-- | src/svg/qsvghandler.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 68929e3..0d2e28e 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -1362,9 +1362,12 @@ static void parseFont(QSvgNode *node, } if (!fontStyle) fontStyle = new QSvgFontStyle; - - if (!attributes.fontFamily.isEmpty() && attributes.fontFamily != QT_INHERIT) - fontStyle->setFamily(attributes.fontFamily.toString().trimmed()); + if (!attributes.fontFamily.isEmpty() && attributes.fontFamily != QT_INHERIT) { + QString family = attributes.fontFamily.toString().trimmed(); + if (family.at(0) == QLatin1Char('\'') || family.at(0) == QLatin1Char('\"')) + family = family.mid(1, family.length() - 2); + fontStyle->setFamily(family); + } if (!attributes.fontSize.isEmpty() && attributes.fontSize != QT_INHERIT) { // TODO: Support relative sizes 'larger' and 'smaller'. |