diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/gui/painting/qbrush.cpp | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/gui/painting/qbrush.cpp')
| -rw-r--r-- | src/gui/painting/qbrush.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index eca2860ab9..d120175108 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -596,8 +596,16 @@ void QBrush::detach(Qt::BrushStyle newStyle) case Qt::RadialGradientPattern: case Qt::ConicalGradientPattern: x.reset(new QGradientBrushData); - static_cast<QGradientBrushData *>(x.data())->gradient = - static_cast<QGradientBrushData *>(d.data())->gradient; + switch (d->style) { + case Qt::LinearGradientPattern: + case Qt::RadialGradientPattern: + case Qt::ConicalGradientPattern: + static_cast<QGradientBrushData *>(x.data())->gradient = + static_cast<QGradientBrushData *>(d.data())->gradient; + break; + default: + break; + } break; default: x.reset(new QBrushData); |