diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-07-25 08:40:07 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-07-30 09:44:05 +0000 |
| commit | 12a08ee8eaa27be7dc500b1c15348e8f692949dc (patch) | |
| tree | 4b5b331f0fa96caf1f0c7eeb822b633934e6114e /src/quickcontrols2 | |
| parent | 4e11d09fdef369af130c86a81df599ee3273ac7d (diff) | |
QQuickIconImage: prevent color from being applied twice
QQuickIconImage::componentComplete() calls
QQuickIconImagePrivate::updateIcon(), which loads the icon's image via
QQuickImageBase::load(). That eventually calls
QQuickImageBase::requestFinished(), which calls
QQuickIconImage::pixmapChange(). That then calls
QQuickIconImagePrivate::updateFillMode(), which can in turn cause
QQuickIconImage::pixmapChange() to be called again, causing recursion.
This recursion resulted in icon.color being applied twice.
We already have a recursion check in place in
QQuickIconImagePrivate::updateFillMode(), so we can reuse that in
QQuickIconImage::pixmapChange() to know whether or not we should apply
the color to the image.
Task-number: QTBUG-69506
Change-Id: I5cd9edaa524c7ceb9c41c53a9efefcc4c647e246
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
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); |