Merge lp://staging/~fboucault/camera-app/do_not_focus_outside_viewfinder into lp://staging/camera-app/staging
Proposed by
Florian Boucault
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ugo Riboni | ||||
Approved revision: | 661 | ||||
Merged at revision: | 661 | ||||
Proposed branch: | lp://staging/~fboucault/camera-app/do_not_focus_outside_viewfinder | ||||
Merge into: | lp://staging/camera-app/staging | ||||
Diff against target: |
24 lines (+9/-5) 1 file modified
ViewFinderView.qml (+9/-5) |
||||
To merge this branch: | bzr merge lp://staging/~fboucault/camera-app/do_not_focus_outside_viewfinder | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ugo Riboni (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email: mp+288112@code.staging.launchpad.net |
Commit message
Only accept manual focus on points inside the viewfinder.
To post a comment you must log in.
FAILED: Continuous integration, rev:661 jenkins. qa.ubuntu. com/job/ camera- app-staging- ci/47/ jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-amd64- ci/47 jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-amd64- ci/47/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-armhf- ci/47 jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-armhf- ci/47/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-i386- ci/47 jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-i386- ci/47/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/424 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- touch/1094 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 1023 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 27978
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/camera- app-staging- ci/47/rebuild
http://