Merge lp:~ken-vandine/content-hub/creatable_content_peer into lp:~content-hub-team/content-hub/trunk
Proposed by
Ken VanDine
Status: | Merged |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 67 |
Merged at revision: | 68 |
Proposed branch: | lp:~ken-vandine/content-hub/creatable_content_peer |
Merge into: | lp:~content-hub-team/content-hub/trunk |
Diff against target: |
60 lines (+25/-2) 3 files modified
examples/import-qml/import.qml (+1/-1) import/Ubuntu/Content/contenthub.cpp (+23/-0) import/Ubuntu/Content/contenthubplugin.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~ken-vandine/content-hub/creatable_content_peer |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thomas Voß (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+194597@code.launchpad.net |
Commit message
allow ContentPeer to be creatable in QML, this makes it more obvious
how to deal with the list returned by knownSourcesFor
Description of the change
allow ContentPeer to be creatable in QML, this makes it more obvious
how to deal with the list returned by knownSourcesFor
To post a comment you must log in.
PASSED: Continuous integration, rev:67 jenkins. qa.ubuntu. com/job/ content- hub-ci/ 101/ jenkins. qa.ubuntu. com/job/ content- hub-trusty- amd64-ci/ 4 jenkins. qa.ubuntu. com/job/ content- hub-trusty- armhf-ci/ 4 jenkins. qa.ubuntu. com/job/ content- hub-trusty- armhf-ci/ 4/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ content- hub-trusty- i386-ci/ 4
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/content- hub-ci/ 101/rebuild
http://