on xenial help sign in
Merge
e515811Albert Astals
debian/changelog+17
@@ -1,3 +1,20 @@
1+unity8 (7.90+14.10.20140725-0ubuntu1) utopic; urgency=low
2+
3+ [ CI bot ]
4+ * Resync trunk
5+
6+ [ Michał Sawicz ]
7+ * Fix the ap test for applications.
8+
9+ [ Albert Astals ]
10+ * Use deleteLater instead of a direct delete We are seeing a crash in
11+ QQuickWindowPrivate::polishItems because LVWPH is deleting items to
12+ polish from it's updatePolish which means the set in
13+ QQuickWindowPrivate::polishItems may end up with some yet-to-
14+ process-but-now-deleted items. Switching to deleteLater fixes this
15+
16+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 25 Jul 2014 10:47:34 +0000
17+
1unity8 (7.90+14.10.20140724.1-0ubuntu1) utopic; urgency=low
18unity8 (7.90+14.10.20140724.1-0ubuntu1) utopic; urgency=low
2
19
3 [ Michael Zanetti ]
20 [ Michael Zanetti ]
plugins/Dash/listviewwithpageheader.cpp+1−1
@@ -656,7 +656,7 @@ void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)
656 if (flags & QQmlDelegateModel::Destroyed) {
656 if (flags & QQmlDelegateModel::Destroyed) {
657 item->setParentItem(nullptr);
657 item->setParentItem(nullptr);
658 }
658 }
659− delete listItem->sectionItem();
659+ listItem->sectionItem()->deleteLater();
660 delete listItem;
660 delete listItem;
661}
661}
662
662
tests/autopilot/unity8/shell/emulators/dash.py+2−2
@@ -199,12 +199,12 @@ class DashApps(GenericScopeView):
199
199
200 """
200 """
201 category_element = self._get_category_element(category)
201 category_element = self._get_category_element(category)
202+ see_all = category_element.select_single(objectName='seeAll')
202 application_cards = category_element.select_many('AbstractButton')
203 application_cards = category_element.select_many('AbstractButton')
203
204
204 application_cards = sorted(
205 application_cards = sorted(
205 (card for card in application_cards
206 (card for card in application_cards
206− if card.globalRect.y
207+ if card.globalRect.y < see_all.globalRect.y),
207− < category_element.globalRect.y + category_element.height),
208 key=lambda card: (card.globalRect.y, card.globalRect.x))
208 key=lambda card: (card.globalRect.y, card.globalRect.x))
209
209
210 result = []
210 result = []