Fixes: NB#191358 - <valgrind><MemLeak> Memory leak in MPopupListItem::setIconID()

RevBy: Daniel d'Andrada
Details: Actually memory leaks were in popuplist unit test and MImageWidget.

2 files changed, 4 insertions, 2 deletions

diff --git a/src/corelib/widgets/mimagewidget.cpp b/src/corelib/widgets/mimagewidget.cpp
index a9973e67..91dda3a4 100644
--- a/src/corelib/widgets/mimagewidget.cpp
+++ b/src/corelib/widgets/mimagewidget.cpp
@@ -41,6 +41,8 @@ MImageWidgetPrivate::~MImageWidgetPrivate()
 {
     if (ownPixmap)
         delete pixmap;
+    else
+        MTheme::releasePixmap(pixmap);
 }
 
 void MImageWidgetPrivate::cleanUp()
diff --git a/tests/ut_mpopuplist/ut_mpopuplist.cpp b/tests/ut_mpopuplist/ut_mpopuplist.cpp
index cb5968f1..8f63454b 100644
--- a/tests/ut_mpopuplist/ut_mpopuplist.cpp
+++ b/tests/ut_mpopuplist/ut_mpopuplist.cpp
@@ -131,8 +131,8 @@ void Ut_MPopupList::testCurrentIndex()
 
 void Ut_MPopupList::testSetItemIconID()
 {
-    QStandardItemModel *itemModel = new QStandardItemModel;
     MList* list = new MList();
+    QStandardItemModel *itemModel = new QStandardItemModel(list);
     MPopupListCellCreator *cellCreator = new MPopupListCellCreator(list);
     list->setCellCreator(cellCreator);
     list->setItemModel(itemModel);
@@ -151,7 +151,7 @@ void Ut_MPopupList::testSetItemIconID()
     cellCreator->updateCell(itemModel->index(0,0), item);
     QCOMPARE(item->icon->image(), QString("icon-l-music"));
 
-    delete itemModel;
+    delete item;
     delete list;
 }