cc8113d · unity8 · git.iko.soy

git.iko.soy/unity8

Fix crash in the shell test

Give the item a parent, otherwise the qml engine decides to adopt it and when we do the deleteLater on them, they have been already deleted. Since we are the parents, we don't need to call the deleteLAter eiether they'll be properly deleted on our deletion

commitcc8113da0db79db01b485d46928d8a1e62b622f3 authorAlbert Astals <albert.astals@canonical.com> dateWed 14 Aug 2013, 13:45 (13 years ago) parentbc86943

1 file changed+10−14

compare with xenial

unifiedsplit

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+10−14

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+10−14

@@ -22,34 +22,30 @@

2222

2323MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(parent)

2424{

25− MockLauncherItem *item = new MockLauncherItem("phone-app", "/usr/share/applications/phone-app.desktop", "Phone", "phone-app");

25+ MockLauncherItem *item = new MockLauncherItem("phone-app", "/usr/share/applications/phone-app.desktop", "Phone", "phone-app", this);

2626 m_list.append(item);

27− item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera");

27+ item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera", this);

2828 m_list.append(item);

29− item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery");

29+ item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery", this);

3030 m_list.append(item);

31− item = new MockLauncherItem("facebook-webapp", "/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook");

31+ item = new MockLauncherItem("facebook-webapp", "/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook", this);

3232 m_list.append(item);

33− item = new MockLauncherItem("webbrowser-app", "/usr/share/applications/webbrowser-app.desktop", "Browser", "browser");

33+ item = new MockLauncherItem("webbrowser-app", "/usr/share/applications/webbrowser-app.desktop", "Browser", "browser", this);

3434 m_list.append(item);

35− item = new MockLauncherItem("twitter-webapp", "/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter");

35+ item = new MockLauncherItem("twitter-webapp", "/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter", this);

3636 m_list.append(item);

37− item = new MockLauncherItem("gmail-webapp", "/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail");

37+ item = new MockLauncherItem("gmail-webapp", "/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail", this);

3838 m_list.append(item);

39− item = new MockLauncherItem("ubuntu-weather-app", "/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather");

39+ item = new MockLauncherItem("ubuntu-weather-app", "/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather", this);

4040 m_list.append(item);

41− item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad");

41+ item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad", this);

4242 m_list.append(item);

43− item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar");

43+ item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);

4444 m_list.append(item);

4545}

4646

4747MockLauncherModel::~MockLauncherModel()

4848{

49− while (!m_list.empty())

50− {

51− m_list.takeFirst()->deleteLater();

52− }

5349}

5450

5551int MockLauncherModel::rowCount(const QModelIndex& parent) const