diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-18 01:00:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-18 01:00:06 +0200 |
| commit | f0f01cc37910a6b1ca454a4374138d76cd09901a (patch) | |
| tree | 1b112993e5b84f58541c7216d1fcc738271f0ab3 /src/imports | |
| parent | 7c3dad14d38aea0239e5e66c9018acdc0e6c0b55 (diff) | |
| parent | 6069cc1cd1a6309cdffeb8bdd9c4035f33742228 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I4a9c7802c180757e70fa4dd16df3287104a088bc
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/shapes/qquickshapegenericrenderer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/shapes/qquickshapegenericrenderer.cpp b/src/imports/shapes/qquickshapegenericrenderer.cpp index 411252a906..8a4785a83a 100644 --- a/src/imports/shapes/qquickshapegenericrenderer.cpp +++ b/src/imports/shapes/qquickshapegenericrenderer.cpp @@ -600,6 +600,7 @@ void QQuickShapeGenericRenderer::updateFillNode(ShapePathData *d, QQuickShapeGen break; default: Q_UNREACHABLE(); + return; } n->activateMaterial(m_item->window(), gradMat); if (d->effectiveDirty & DirtyFillGradient) { |