on xenial help sign in
Merge
commitded28597a661f23e1b3f68504e17e4099d7c805f authorAlbert Astals <albert.astals@canonical.com> dateFri 25 Jul 2014, 15:58 (12 years ago) parentaf2f0bb31927c6
2 files changed+19−2
debian/changelog+17 tests/autopilot/unity8/shell/emulators/dash.py+2−2
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+
118unity8 (7.90+14.10.20140724.1-0ubuntu1) utopic; urgency=low
219
320 [ Michael Zanetti ]
tests/autopilot/unity8/shell/emulators/dash.py+2−2
@@ -208,12 +208,12 @@ class DashApps(GenericScopeView):
208208
209209 """
210210 category_element = self._get_category_element(category)
211+ see_all = category_element.select_single(objectName='seeAll')
211212 application_cards = category_element.select_many('AbstractButton')
212213
213214 application_cards = sorted(
214215 (card for card in application_cards
215− if card.globalRect.y
216− < category_element.globalRect.y + category_element.height),
216+ if card.globalRect.y < see_all.globalRect.y),
217217 key=lambda card: (card.globalRect.y, card.globalRect.x))
218218
219219 result = []