diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:05:41 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:05:41 +0200 |
| commit | 1983ba1de3d4ffec65fcfbd74328963afb2c57c1 (patch) | |
| tree | 93b0cdb40d5b3b99c88d0baa2214727d882aba1f /src/svg/qsvghandler.cpp | |
| parent | 899ccaa307e49af0c3f2f2ea785301e3e6eaff14 (diff) | |
| parent | 7e7ed705efc51134b27820d76beceefc62ab0b3d (diff) | |
| download | qtsvg-1983ba1de3d4ffec65fcfbd74328963afb2c57c1.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I962bd9762be35f5905367a96a19038eb9b3c7637
Diffstat (limited to 'src/svg/qsvghandler.cpp')
| -rw-r--r-- | src/svg/qsvghandler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index d30cf9f..fe79977 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -2615,17 +2615,17 @@ static QSvgStyleProperty *createFontNode(QSvgNode *parent, parent = parent->parent(); } - if (parent) { + if (parent && !myId.isEmpty()) { QSvgTinyDocument *doc = static_cast<QSvgTinyDocument*>(parent); - QSvgFont *font = new QSvgFont(horizAdvX); - font->setFamilyName(myId); - if (!font->familyName().isEmpty()) { - if (!doc->svgFont(font->familyName())) - doc->addSvgFont(font); + QSvgFont *font = doc->svgFont(myId); + if (!font) { + font = new QSvgFont(horizAdvX); + font->setFamilyName(myId); + doc->addSvgFont(font); } return new QSvgFontStyle(font, doc); } - return 0; + return nullptr; } static bool parseFontFaceNode(QSvgStyleProperty *parent, |