Merge lp://qastaging/~dobey/pay-ui/iap-support into lp://qastaging/pay-ui
Proposed by
dobey
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 134 |
Merged at revision: | 136 |
Proposed branch: | lp://qastaging/~dobey/pay-ui/iap-support |
Merge into: | lp://qastaging/pay-ui |
Prerequisite: | lp://qastaging/~dobey/pay-ui/fix-page-returns |
Diff against target: |
330 lines (+88/-30) 5 files modified
app/payui.qml (+2/-2) backend/modules/payui/network.cpp (+52/-13) backend/modules/payui/network.h (+5/-4) backend/modules/payui/purchase.cpp (+20/-2) backend/tests/test_network.cpp (+9/-9) |
To merge this branch: | bzr merge lp://qastaging/~dobey/pay-ui/iap-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Charles Kerr (community) | Approve | ||
Review via email:
|
This proposal supersedes a proposal from 2015-09-21.
Commit message
Support for performing in-app purchases.
To post a comment you must log in.
PASSED: Continuous integration, rev:132 jenkins. qa.ubuntu. com/job/ pay-ui- ci/142/ jenkins. qa.ubuntu. com/job/ generic- click-autopilot -14.09- touch/17 jenkins. qa.ubuntu. com/job/ generic- click-builder- 14.09-armhf/ 35 jenkins. qa.ubuntu. com/job/ pay-ui- 14.09-armhf- ci/1 jenkins. qa.ubuntu. com/job/ pay-ui- 14.09-armhf- ci/1/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- mako/925 jenkins. qa.ubuntu. com/job/ generic- click-builder- 14.09-armhf/ 36 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 23534
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/pay- ui-ci/142/ rebuild
http://