1 files changed, 16 insertions, 43 deletions

diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 3a296ac40c..acea5682d1 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -458,13 +458,8 @@ QBrush::QBrush(const QImage &image)
 */
 
 QBrush::QBrush(Qt::BrushStyle style)
+    : QBrush(QColor(Qt::black), style)
 {
-    if (qbrush_check_type(style))
-        init(Qt::black, style);
-    else {
-        d.reset(nullBrushInstance());
-        d->ref.ref();
-    }
 }
 
 /*!
@@ -491,13 +486,8 @@ QBrush::QBrush(const QColor &color, Qt::BrushStyle style)
     \sa setColor(), setStyle()
 */
 QBrush::QBrush(Qt::GlobalColor color, Qt::BrushStyle style)
+    : QBrush(QColor(color), style)
 {
-    if (qbrush_check_type(style))
-        init(color, style);
-    else {
-        d.reset(nullBrushInstance());
-        d->ref.ref();
-    }
 }
 
 /*!
@@ -579,11 +569,20 @@ void QBrush::cleanUp(QBrushData *x)
     QBrushDataPointerDeleter::deleteData(x);
 }
 
+static Q_DECL_CONSTEXPR inline bool use_same_brushdata(Qt::BrushStyle lhs, Qt::BrushStyle rhs)
+{
+    return lhs == rhs // includes Qt::TexturePattern
+        || (lhs >= Qt::NoBrush && lhs <= Qt::DiagCrossPattern && rhs >= Qt::NoBrush && rhs <= Qt::DiagCrossPattern)
+        || (lhs >= Qt::LinearGradientPattern && lhs <= Qt::ConicalGradientPattern && rhs >= Qt::LinearGradientPattern && rhs <= Qt::ConicalGradientPattern)
+           ;
+}
 
 void QBrush::detach(Qt::BrushStyle newStyle)
 {
-    if (newStyle == d->style && d->ref.load() == 1)
+    if (use_same_brushdata(newStyle, d->style) && d->ref.load() == 1) {
+        d->style = newStyle;
         return;
+    }
 
     QScopedPointer<QBrushData> x;
     switch(newStyle) {
@@ -1673,13 +1672,8 @@ QLinearGradient::QLinearGradient(const QPointF &start, const QPointF &finalStop)
     \sa QGradient::setColorAt(), QGradient::setStops()
 */
 QLinearGradient::QLinearGradient(qreal xStart, qreal yStart, qreal xFinalStop, qreal yFinalStop)
+    : QLinearGradient(QPointF(xStart, yStart), QPointF(xFinalStop, yFinalStop))
 {
-    m_type = LinearGradient;
-    m_spread = PadSpread;
-    m_data.linear.x1 = xStart;
-    m_data.linear.y1 = yStart;
-    m_data.linear.x2 = xFinalStop;
-    m_data.linear.y2 = yFinalStop;
 }
 
 
@@ -1882,19 +1876,8 @@ QRadialGradient::QRadialGradient(const QPointF &center, qreal radius)
 */
 
 QRadialGradient::QRadialGradient(qreal cx, qreal cy, qreal radius, qreal fx, qreal fy)
+    : QRadialGradient(QPointF(cx, cy), radius, QPointF(fx, fy))
 {
-    m_type = RadialGradient;
-    m_spread = PadSpread;
-    m_data.radial.cx = cx;
-    m_data.radial.cy = cy;
-    m_data.radial.cradius = radius;
-
-    QPointF adapted_focal = qt_radial_gradient_adapt_focal_point(QPointF(cx, cy),
-                                                                 radius,
-                                                                 QPointF(fx, fy));
-
-    m_data.radial.fx = adapted_focal.x();
-    m_data.radial.fy = adapted_focal.y();
 }
 
 /*!
@@ -1904,14 +1887,8 @@ QRadialGradient::QRadialGradient(qreal cx, qreal cy, qreal radius, qreal fx, qre
     \sa QGradient::setColorAt(), QGradient::setStops()
  */
 QRadialGradient::QRadialGradient(qreal cx, qreal cy, qreal radius)
+    : QRadialGradient(QPointF(cx, cy), radius)
 {
-    m_type = RadialGradient;
-    m_spread = PadSpread;
-    m_data.radial.cx = cx;
-    m_data.radial.cy = cy;
-    m_data.radial.cradius = radius;
-    m_data.radial.fx = cx;
-    m_data.radial.fy = cy;
 }
 
 
@@ -2211,12 +2188,8 @@ QConicalGradient::QConicalGradient(const QPointF &center, qreal angle)
 */
 
 QConicalGradient::QConicalGradient(qreal cx, qreal cy, qreal angle)
+    : QConicalGradient(QPointF(cx, cy), angle)
 {
-    m_type = ConicalGradient;
-    m_spread = PadSpread;
-    m_data.conical.cx = cx;
-    m_data.conical.cy = cy;
-    m_data.conical.angle = angle;
 }