3 files changed, 21 insertions, 15 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 56dab5f..18ba71c 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -2649,7 +2649,6 @@ static QSvgStyleProperty *createLinearGradientNode(QSvgNode *node,
     }
 
     QLinearGradient *grad = new QLinearGradient(nx1, ny1, nx2, ny2);
-    grad->setColorAt(qQNaN(), QColor());
     grad->setInterpolationMode(QGradient::ComponentInterpolation);
     QSvgGradientStyle *prop = new QSvgGradientStyle(grad);
     parseBaseGradient(node, attributes, prop, handler);
@@ -2783,7 +2782,6 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node,
         nfy = toDouble(fy);
 
     QRadialGradient *grad = new QRadialGradient(ncx, ncy, nr, nfx, nfy);
-    grad->setColorAt(qQNaN(), QColor());
     grad->setInterpolationMode(QGradient::ComponentInterpolation);
 
     QSvgGradientStyle *prop = new QSvgGradientStyle(grad);
@@ -2929,12 +2927,9 @@ static bool parseStopNode(QSvgStyleProperty *parent,
     QGradient *grad = style->qgradient();
 
     offset = qMin(qreal(1), qMax(qreal(0), offset)); // Clamp to range [0, 1]
-    QGradientStops stops = grad->stops();
-    // Check if the gradient is marked as empty (marked with one single stop at NaN).
-    if ((stops.size() == 1) && qIsNaN(stops.at(0).first)) {
-        stops.clear();
-        grad->setStops(stops);
-    } else {
+    QGradientStops stops;
+    if (style->gradientStopsSet()) {
+        stops = grad->stops();
         // If the stop offset equals the one previously added, add an epsilon to make it greater.
         if (offset <= stops.back().first)
             offset = stops.back().first + FLT_EPSILON;
@@ -2950,6 +2945,7 @@ static bool parseStopNode(QSvgStyleProperty *parent,
     }
 
     grad->setColorAt(offset, color);
+    style->setGradientStopsSet(true);
     if (!colorOK)
         style->addResolve(offset);
     return true;
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index 389f68f..4a40bed 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -231,7 +231,7 @@ void QSvgSolidColorStyle::revert(QPainter *p, QSvgExtraStates &)
 }
 
 QSvgGradientStyle::QSvgGradientStyle(QGradient *grad)
-    : m_gradient(grad)
+    : m_gradient(grad), m_gradientStopsSet(false)
 {
 }
 
@@ -256,14 +256,13 @@ void QSvgGradientStyle::apply(QPainter *p, const QRectF &/*rect*/, QSvgNode *, Q
     }
 
     // If the gradient is marked as empty, insert transparent black
-    QGradientStops stops = m_gradient->stops();
-    if (stops.size() == 1 && qIsNaN(stops.at(0).first))
-        m_gradient->setStops(QGradientStops() << QGradientStop(0.0, QColor(0, 0, 0, 0)));
-
-    QGradient gradient = *m_gradient;
+    if (!m_gradientStopsSet) {
+        m_gradient->setColorAt(0.0, QColor(0, 0, 0, 0));
+        m_gradientStopsSet = true;
+    }
 
     QBrush brush;
-    brush = QBrush(gradient);
+    brush = QBrush(*m_gradient);
 
     if (!m_matrix.isIdentity())
         brush.setMatrix(m_matrix);
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index ff4058b..058ba35 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -376,6 +376,16 @@ public:
     }
 
     void addResolve(qreal offset);
+
+    bool gradientStopsSet() const
+    {
+        return m_gradientStopsSet;
+    }
+
+    void setGradientStopsSet(bool set)
+    {
+        m_gradientStopsSet = set;
+    }
 private:
     QGradient      *m_gradient;
     QList<qreal>  m_resolvePoints;
@@ -386,6 +396,7 @@ private:
 
     QSvgTinyDocument *m_doc;
     QString           m_link;
+    bool m_gradientStopsSet;
 };
 
 class QSvgTransformStyle : public QSvgStyleProperty