Merge lp://qastaging/~artmello/gallery-app/gallery-app-qml_content_hub into lp://qastaging/gallery-app
Proposed by
Arthur Mello
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Bill Filler | ||||
Approved revision: | 1311 | ||||
Merged at revision: | 1310 | ||||
Proposed branch: | lp://qastaging/~artmello/gallery-app/gallery-app-qml_content_hub | ||||
Merge into: | lp://qastaging/gallery-app | ||||
Diff against target: |
906 lines (+181/-429) 10 files modified
CMakeLists.txt (+0/-1) debian/control (+1/-1) rc/qml/GalleryApplication.qml (+3/-0) rc/qml/MainScreen.qml (+51/-38) rc/qml/PickerScreen.qml (+54/-11) src/CMakeLists.txt (+0/-2) src/content-communicator.cpp (+0/-197) src/content-communicator.h (+0/-69) src/gallery-application.cpp (+69/-101) src/gallery-application.h (+3/-9) |
||||
To merge this branch: | bzr merge lp://qastaging/~artmello/gallery-app/gallery-app-qml_content_hub | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
Stop using C++ Content Hub API and use QML one instead
Description of the change
Stop using C++ Content Hub API and use QML one instead
To post a comment you must log in.
FAILED: Continuous integration, rev:1310 jenkins. qa.ubuntu. com/job/ gallery- app-ci/ 1242/ jenkins. qa.ubuntu. com/job/ gallery- app-vivid- amd64-ci/ 170/console jenkins. qa.ubuntu. com/job/ gallery- app-vivid- armhf-ci/ 170/console jenkins. qa.ubuntu. com/job/ gallery- app-vivid- i386-ci/ 170/console jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/440/ console jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 1047/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/gallery- app-ci/ 1242/rebuild
http://