aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols2/qquickiconimage.cpp
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2022-09-12 18:30:02 +0300
committerTarja Sundqvist <tarja.sundqvist@qt.io>2022-09-12 18:30:02 +0300
commit5b169fcfcb123c5a129ba63133dd27c56675a479 (patch)
treea2575e73bd5edf2086dab1a5d15a9526abfd80a1 /src/quickcontrols2/qquickiconimage.cpp
parentbbd4a25e456a2922ff71d9cbe9a8b7f656e753ad (diff)
parent92f20b4f4e498fadd0eff087a30be4f0ccfd3048 (diff)
Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensourcev5.15.7-lts-lgpl
Diffstat (limited to 'src/quickcontrols2/qquickiconimage.cpp')
-rw-r--r--src/quickcontrols2/qquickiconimage.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quickcontrols2/qquickiconimage.cpp b/src/quickcontrols2/qquickiconimage.cpp
index d86afd7f..11bb3bca 100644
--- a/src/quickcontrols2/qquickiconimage.cpp
+++ b/src/quickcontrols2/qquickiconimage.cpp
@@ -42,6 +42,12 @@
QT_BEGIN_NAMESPACE
+QQuickIconImagePrivate::~QQuickIconImagePrivate()
+{
+ qDeleteAll(icon.entries);
+ icon.entries.clear();
+}
+
bool QQuickIconImagePrivate::updateDevicePixelRatio(qreal targetDevicePixelRatio)
{
if (isThemeIcon) {
@@ -132,6 +138,7 @@ void QQuickIconImage::setName(const QString &name)
if (d->icon.iconName == name)
return;
+ qDeleteAll(d->icon.entries);
d->icon = QIconLoader::instance()->loadIcon(name);
if (isComponentComplete())
d->updateIcon();