aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols2
diff options
context:
space:
mode:
Diffstat (limited to 'src/quickcontrols2')
-rw-r--r--src/quickcontrols2/qquickiconimage.cpp3
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);