Merge lp:~michael-sheldon/content-hub/fix-1390096-rtm into lp:content-hub/rtm-14.09

Proposed by Michael Sheldon on 2015-01-19
Status: Merged
Approved by: Bill Filler on 2015-01-21
Approved revision: 139
Merged at revision: 140
Proposed branch: lp:~michael-sheldon/content-hub/fix-1390096-rtm
Merge into: lp:content-hub/rtm-14.09
Diff against target: 35 lines (+2/-1)
3 files modified
import/Ubuntu/Content/ContentPeerPicker10.qml (+1/-0)
import/Ubuntu/Content/ContentPeerPicker11.qml (+1/-0)
import/Ubuntu/Content/contentpeermodel.cpp (+0/-1)
To merge this branch: bzr merge lp:~michael-sheldon/content-hub/fix-1390096-rtm
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-01-19
Ubuntu Phablet Team 2015-01-19 Pending
Review via email: mp+246881@code.launchpad.net

Commit message

Cherry pick fix for displaying "No applications available" message from trunk

Description of the change

Cherry pick fix for displaying "No applications available" message from trunk

To post a comment you must log in.
Michael Sheldon (michael-sheldon) wrote :

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes (in sync with RTM branch)

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'import/Ubuntu/Content/ContentPeerPicker10.qml'
2--- import/Ubuntu/Content/ContentPeerPicker10.qml 2014-10-10 15:28:39 +0000
3+++ import/Ubuntu/Content/ContentPeerPicker10.qml 2015-01-19 11:48:20 +0000
4@@ -51,6 +51,7 @@
5 Loader {
6 id: peerModelLoader
7 active: false
8+ asynchronous: true
9 sourceComponent: ContentPeerModel { }
10 onLoaded: {
11 item.handler = root.handler;
12
13=== modified file 'import/Ubuntu/Content/ContentPeerPicker11.qml'
14--- import/Ubuntu/Content/ContentPeerPicker11.qml 2014-10-10 15:28:39 +0000
15+++ import/Ubuntu/Content/ContentPeerPicker11.qml 2015-01-19 11:48:20 +0000
16@@ -68,6 +68,7 @@
17 Loader {
18 id: peerModelLoader
19 active: false
20+ asynchronous: true
21 sourceComponent: ContentPeerModel { }
22 onLoaded: {
23 item.handler = root.handler;
24
25=== modified file 'import/Ubuntu/Content/contentpeermodel.cpp'
26--- import/Ubuntu/Content/contentpeermodel.cpp 2014-08-05 21:01:22 +0000
27+++ import/Ubuntu/Content/contentpeermodel.cpp 2015-01-19 11:48:20 +0000
28@@ -95,7 +95,6 @@
29 void ContentPeerModel::findPeers() {
30 TRACE() << Q_FUNC_INFO;
31 m_peers.clear();
32- QCoreApplication::processEvents();
33 if(m_contentType == ContentType::All) {
34 appendPeersForContentType(ContentType::Documents);
35 appendPeersForContentType(ContentType::Pictures);

Subscribers

People subscribed via source and target branches