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

[Michael Sheldon]

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

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

[Michael Sheldon (michael-sheldon)]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/content-hub-rtm-14.09-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-rtm-14.09-14.09-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-rtm-14.09-14.09-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-rtm-14.09-ci/3/rebuild

review: Approve (continuous-integration)

=== modified file 'import/Ubuntu/Content/ContentPeerPicker10.qml'
--- import/Ubuntu/Content/ContentPeerPicker10.qml	2014-10-10 15:28:39 +0000
+++ import/Ubuntu/Content/ContentPeerPicker10.qml	2015-01-19 11:48:20 +0000
@@ -51,6 +51,7 @@
     Loader {
         id: peerModelLoader
         active: false
+        asynchronous: true
         sourceComponent: ContentPeerModel { }
         onLoaded: {
             item.handler = root.handler;
 
=== modified file 'import/Ubuntu/Content/ContentPeerPicker11.qml'
--- import/Ubuntu/Content/ContentPeerPicker11.qml	2014-10-10 15:28:39 +0000
+++ import/Ubuntu/Content/ContentPeerPicker11.qml	2015-01-19 11:48:20 +0000
@@ -68,6 +68,7 @@
     Loader {
         id: peerModelLoader
         active: false
+        asynchronous: true
         sourceComponent: ContentPeerModel { }
         onLoaded: {
             item.handler = root.handler;
 
=== modified file 'import/Ubuntu/Content/contentpeermodel.cpp'
--- import/Ubuntu/Content/contentpeermodel.cpp	2014-08-05 21:01:22 +0000
+++ import/Ubuntu/Content/contentpeermodel.cpp	2015-01-19 11:48:20 +0000
@@ -95,7 +95,6 @@
 void ContentPeerModel::findPeers() {
     TRACE() << Q_FUNC_INFO;
     m_peers.clear();
-    QCoreApplication::processEvents();
     if(m_contentType == ContentType::All) {
         appendPeersForContentType(ContentType::Documents);
         appendPeersForContentType(ContentType::Pictures);