summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-18 11:55:07 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-18 11:55:07 +0100
commit2c67415afc2e12bab958e16b18bcab88a537c248 (patch)
tree277d0fd9a1cb9ac13ace7c741766807f18542214
parent8dbfbe633ee7cd1853354830872fc1c60f9e2139 (diff)
parent92ae8746c412fbc87a97364eb4d86e470009f80d (diff)
downloadqtsvg-2c67415afc2e12bab958e16b18bcab88a537c248.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3
Change-Id: Ic4b8abc44f58b3d5d34cddf2743d0d172df4a374
-rw-r--r--src/svg/qsvghandler.cpp9
-rw-r--r--src/svg/qsvgstyle.cpp2
-rw-r--r--src/svg/qsvgstyle_p.h2
3 files changed, 8 insertions, 5 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'.
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index f981931..924cca0 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -232,7 +232,7 @@ void QSvgFontStyle::apply(QPainter *p, const QSvgNode *, QSvgExtraStates &states
QFont font = m_oldQFont;
if (m_familySet) {
states.svgFont = m_svgFont;
- font.setFamily(m_qfont.family());
+ font.setFamilies(m_qfont.families());
}
if (m_sizeSet)
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index 5e0b7cc..41d0e11 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -348,7 +348,7 @@ public:
void setFamily(const QString &family)
{
- m_qfont.setFamily(family);
+ m_qfont.setFamilies({family});
m_familySet = 1;
}