camera-app

Merge lp://qastaging/~fboucault/camera-app/fix_taking_pic_while_scanning into lp://qastaging/camera-app

  1. fix_taking_pic_while_scanning
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Bill Filler
Approved revision: 478
Merged at revision: 478
Proposed branch: lp://qastaging/~fboucault/camera-app/fix_taking_pic_while_scanning
Merge into: lp://qastaging/camera-app
Diff against target: 46 lines (+10/-3)
3 files modified
CameraApp/foldersmodel.cpp (+8/-1)
CameraApp/foldersmodel.h (+1/-1)
GalleryView.qml (+1/-1)
To merge this branch: bzr merge lp://qastaging/~fboucault/camera-app/fix_taking_pic_while_scanning
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Bill Filler Pending
Review via email: mp+247534@code.qastaging.launchpad.net

Commit message

Fix case when pictures have been taken while the library is being scanned.

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

FAILED: Continuous integration, rev:478
http://jenkins.qa.ubuntu.com/job/camera-app-ci/365/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/61
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/99/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/455
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/738/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/195
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17425
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/547
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/547/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches