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/qsvgstyle.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/qsvgstyle.cpp')
-rw-r--r-- | src/svg/qsvgstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) |