diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2017-03-22 14:50:27 +0100 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-03-22 14:07:05 +0000 |
commit | d9cada5368801d1fd7af8e70cafad33a80156591 (patch) | |
tree | f461b755c130509b1fd50e7f316ad609ecefed6b /src/quickcontrols2/qquickiconimage.cpp | |
parent | b18b6375d170ce02dc5a627bfb69ca49046ee05c (diff) |
QQuickIconImage: only call updateIcon() when necessary
Unconditionally updating the icon was causing binding loops when
changing the spacing of a Button with icons.
Change-Id: Ie8511afea7ebc365a28f954091d9cc22883d2e40
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quickcontrols2/qquickiconimage.cpp')
-rw-r--r-- | src/quickcontrols2/qquickiconimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quickcontrols2/qquickiconimage.cpp b/src/quickcontrols2/qquickiconimage.cpp index 2ebb38eb..5709e057 100644 --- a/src/quickcontrols2/qquickiconimage.cpp +++ b/src/quickcontrols2/qquickiconimage.cpp @@ -181,7 +181,7 @@ void QQuickIconImage::geometryChanged(const QRectF &newGeometry, const QRectF &o { Q_D(QQuickIconImage); QQuickImage::geometryChanged(newGeometry, oldGeometry); - if (isComponentComplete()) + if (isComponentComplete() && newGeometry.size() != oldGeometry.size()) d->updateIcon(); } |