diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-08 08:38:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-08 08:38:32 +0200 |
| commit | 628df3881fbb3d3bd1ee4316b47df5871c6dad73 (patch) | |
| tree | 89226f86cde26330b1e63d2f9e9e59faf1ad9d5c /src/quickcontrols2 | |
| parent | f6e2de9d75ebd6c782fcb20e48375c9ac80d9d25 (diff) | |
| parent | 4865136be9c61aab50c8f30942996bba58a59c3b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I483081703594a8398d51a23c6d2266ac0ae9dfb0
Diffstat (limited to 'src/quickcontrols2')
| -rw-r--r-- | src/quickcontrols2/qquickiconimage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quickcontrols2/qquickiconimage.cpp b/src/quickcontrols2/qquickiconimage.cpp index c8357647..d86afd7f 100644 --- a/src/quickcontrols2/qquickiconimage.cpp +++ b/src/quickcontrols2/qquickiconimage.cpp @@ -198,7 +198,8 @@ void QQuickIconImage::pixmapChange() QQuickImage::pixmapChange(); d->updateFillMode(); - if (d->color.alpha() > 0) { + // Don't apply the color if we're recursing (updateFillMode() can cause us to recurse). + if (!d->updatingFillMode && d->color.alpha() > 0) { QImage image = d->pix.image(); if (!image.isNull()) { QPainter painter(&image); |