diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:13:50 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:13:50 +0200 |
| commit | 392359c5413e2a824699625ee9174bb1a6eb8a71 (patch) | |
| tree | ebd567f87acf54e14746faceb7b4fdac98baa60b /src | |
| parent | 35d967c954245e313017a1cab97ce7ee9f08b3a8 (diff) | |
| parent | 9f1c31c8a3cfd0f341987e8011abad172592dd3c (diff) | |
| download | qtsvg-392359c5413e2a824699625ee9174bb1a6eb8a71.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I521c0f85547f8a3272d201e2c7d48341bbf9034c
Diffstat (limited to 'src')
| -rw-r--r-- | src/svg/doc/src/svgrendering.qdoc | 2 | ||||
| -rw-r--r-- | src/svg/qsvgstyle.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/svg/doc/src/svgrendering.qdoc b/src/svg/doc/src/svgrendering.qdoc index 3ef66d5..eb8a365 100644 --- a/src/svg/doc/src/svgrendering.qdoc +++ b/src/svg/doc/src/svgrendering.qdoc @@ -40,7 +40,7 @@ \snippet doc_src_qtsvg.pro 1 - \section1 Rendering SVG files + \section1 Rendering SVG Files Scalable Vector Graphics (SVG) is a language for describing two-dimensional graphics and graphical applications in XML. SVG 1.1 is a W3C Recommendation diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index ac36de2..982c168 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -929,7 +929,7 @@ void QSvgGradientStyle::resolveStops() { if (!m_link.isEmpty() && m_doc) { QSvgStyleProperty *prop = m_doc->styleProperty(m_link); - if (prop) { + if (prop && prop != this) { if (prop->type() == QSvgStyleProperty::GRADIENT) { QSvgGradientStyle *st = static_cast<QSvgGradientStyle*>(prop); |