aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Kapusta <dominik.kapusta@teleca.com>2010-08-10 14:03:21 +0200
committerDominik Kapusta <dominik.kapusta@teleca.com>2010-08-10 14:03:21 +0200
commitb43c22aaa932776a822662b5cf9852e6bd490db1 (patch)
tree141f2cc3d51daf9840d12633f7276c114c55ce31
parent08a035e083961f59bb724a80285def31ba47be35 (diff)
Changes: Fix for ut_mpopuplist
RevBy: Marcin Details: My bad...
-rw-r--r--src/views/mpopuplistview_p.h3
-rw-r--r--tests/ut_mpopuplist/ut_mpopuplist.cpp4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/views/mpopuplistview_p.h b/src/views/mpopuplistview_p.h
index 2ded1607..e786794f 100644
--- a/src/views/mpopuplistview_p.h
+++ b/src/views/mpopuplistview_p.h
@@ -51,6 +51,9 @@ private:
MImageWidget* icon;
MLabel* title;
ItemStyle itemStyle;
+#ifdef UNIT_TEST
+ friend class Ut_MPopupList;
+#endif
};
class MPopupListViewPrivate : public MDialogViewPrivate, public MAbstractCellCreator<MPopupListItem>
diff --git a/tests/ut_mpopuplist/ut_mpopuplist.cpp b/tests/ut_mpopuplist/ut_mpopuplist.cpp
index 1a4dc5b9..40217f11 100644
--- a/tests/ut_mpopuplist/ut_mpopuplist.cpp
+++ b/tests/ut_mpopuplist/ut_mpopuplist.cpp
@@ -143,12 +143,12 @@ void Ut_MPopupList::testSetItemIconID()
// First add item with text to model and build it
itemModel->appendRow(new QStandardItem("Item"));
item = (MPopupListItem *)(view->createCell(itemModel->index(0, 0),recycler));
- QCOMPARE(item->imageWidget()->image(), QString());
+ QVERIFY(item->icon == 0);
// Add icon to previously set item
itemModel->setData(itemModel->index(0, 0), "icon-l-music", Qt::DecorationRole);
view->updateCell(itemModel->index(0,0), item);
- QCOMPARE(item->imageWidget()->image(), QString("icon-l-music"));
+ QCOMPARE(item->icon->image(), QString("icon-l-music"));
delete itemModel;
delete view;