diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 10:37:46 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 10:37:46 +0200 |
| commit | 99218c5fc00d6124fdcef1a3e1954e658d10db28 (patch) | |
| tree | 1891cc34fabc325b772d84ae99839aea72eb5605 /src | |
| parent | 11c985829493f3aed8e7894e5f9fdd44891ec249 (diff) | |
| parent | fd12ae24b4542cf2f0df1a34187c4b8c0a408e01 (diff) | |
| download | qtsvg-99218c5fc00d6124fdcef1a3e1954e658d10db28.tar.gz | |
Merge remote-tracking branch 'origin/5.12.3' into 5.12
Change-Id: I73662000d1b52a4b61a9bd0a58af2fb9a7dc7b22
Diffstat (limited to 'src')
| -rw-r--r-- | src/svg/qsvgstyle.cpp | 11 | ||||
| -rw-r--r-- | src/svg/qsvgstyle_p.h | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index 5448797..b934f94 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -942,13 +942,20 @@ void QSvgGradientStyle::setStopLink(const QString &link, QSvgTinyDocument *doc) void QSvgGradientStyle::resolveStops() { + QStringList visited; + resolveStops_helper(&visited); +} + +void QSvgGradientStyle::resolveStops_helper(QStringList *visited) +{ if (!m_link.isEmpty() && m_doc) { QSvgStyleProperty *prop = m_doc->styleProperty(m_link); - if (prop && prop != this) { + if (prop && !visited->contains(m_link)) { + visited->append(m_link); if (prop->type() == QSvgStyleProperty::GRADIENT) { QSvgGradientStyle *st = static_cast<QSvgGradientStyle*>(prop); - st->resolveStops(); + st->resolveStops_helper(visited); m_gradient->setStops(st->qgradient()->stops()); m_gradientStopsSet = st->gradientStopsSet(); } diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index 916c9fa..39aa690 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -577,6 +577,7 @@ public: void setStopLink(const QString &link, QSvgTinyDocument *doc); QString stopLink() const { return m_link; } void resolveStops(); + void resolveStops_helper(QStringList *visited); void setMatrix(const QMatrix &matrix); QMatrix qmatrix() const |