camera-app

Merge lp:~aacid/camera-app/missing-return into lp:camera-app

  1. missing-return
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Florian Boucault
Approved revision: 589
Merged at revision: 598
Proposed branch: lp:~aacid/camera-app/missing-return
Merge into: lp:camera-app
Diff against target: 11 lines (+1/-0)
1 file modified
CameraApp/advancedcamerasettings.cpp (+1/-0)
To merge this branch: bzr merge lp:~aacid/camera-app/missing-return
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+275819@code.launchpad.net

Commit message

Add missing return in AdvancedCameraSettings::mediaControlFromCamera

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:589
http://jenkins.qa.ubuntu.com/job/camera-app-ci/443/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/284/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/937/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/766
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24588

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/443/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CameraApp/advancedcamerasettings.cpp'
2--- CameraApp/advancedcamerasettings.cpp 2015-01-08 13:44:13 +0000
3+++ CameraApp/advancedcamerasettings.cpp 2015-10-27 09:18:27 +0000
4@@ -79,6 +79,7 @@
5 return 0;
6 }
7
8+ return control;
9 }
10
11 QVideoDeviceSelectorControl* AdvancedCameraSettings::selectorFromCamera(QCamera *camera) const

Subscribers

People subscribed via source and target branches